1 files changed, 53 insertions, 40 deletions
diff --git a/chromium/chrome/browser/resources/extensions/BUILD.gn b/chromium/chrome/browser/resources/extensions/BUILD.gn
index 1798f6238a7..734470fdaf4 100644
--- a/chromium/chrome/browser/resources/extensions/BUILD.gn
+++ b/chromium/chrome/browser/resources/extensions/BUILD.gn
@@ -7,46 +7,48 @@ import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
 import("../optimize_webui.gni")
 
-extensions_pak_file = "extensions_resources.pak"
-unpak_folder = "extensions_resources.unpak"
-
-optimize_webui("build") {
-  host = "extensions"
-  html_in_files = [ "extensions.html" ]
-  html_out_files = [ "vulcanized.html" ]
-  insert_in_head = "<base href=\"chrome://extensions\">"
-  input = rebase_path("$target_gen_dir/$unpak_folder", root_build_dir)
-  js_out_files = [ "crisper.js" ]
-  replace_for_html_imports_polyfill = "crisper.js"
-
-  deps = [
-    ":unpak",
-  ]
-}
-
-unpak("unpak") {
-  pak_file = extensions_pak_file
-  out_folder = unpak_folder
-
-  deps = [
-    ":flattened_resources",
-  ]
-}
-
-grit("flattened_resources") {
-  source = "extensions_resources.grd"
-
-  # The .grd contains references to generated files.
-  source_is_generated = true
-
-  defines = chrome_grit_defines
-  outputs = [
-    "grit/extensions_resources.h",
-    "grit/extensions_resources_map.cc",
-    "grit/extensions_resources_map.h",
-    extensions_pak_file,
-  ]
-  output_dir = "$root_gen_dir/chrome/browser/resources/extensions"
+if (optimize_webui) {
+  extensions_pak_file = "extensions_resources.pak"
+  unpak_folder = "extensions_resources.unpak"
+
+  optimize_webui("build") {
+    host = "extensions"
+    html_in_files = [ "extensions.html" ]
+    html_out_files = [ "vulcanized.html" ]
+    insert_in_head = "<base href=\"chrome://extensions\">"
+    input = rebase_path("$target_gen_dir/$unpak_folder", root_build_dir)
+    js_out_files = [ "crisper.js" ]
+    replace_for_html_imports_polyfill = "crisper.js"
+
+    deps = [
+      ":unpak",
+    ]
+  }
+
+  unpak("unpak") {
+    pak_file = extensions_pak_file
+    out_folder = unpak_folder
+
+    deps = [
+      ":flattened_resources",
+    ]
+  }
+
+  grit("flattened_resources") {
+    source = "extensions_resources.grd"
+
+    # The .grd contains references to generated files.
+    source_is_generated = true
+
+    defines = chrome_grit_defines
+    outputs = [
+      "grit/extensions_resources.h",
+      "grit/extensions_resources_map.cc",
+      "grit/extensions_resources_map.h",
+      extensions_pak_file,
+    ]
+    output_dir = "$root_gen_dir/chrome/browser/resources/extensions"
+  }
 }
 
 group("closure_compile") {
@@ -69,6 +71,7 @@ js_type_check("extensions_resources") {
     ":item_behavior",
     ":item_list",
     ":item_util",
+    ":keyboard_shortcut_delegate",
     ":keyboard_shortcuts",
     ":kiosk_browser_proxy",
     ":kiosk_dialog",
@@ -207,9 +210,17 @@ js_library("item_util") {
   externs_list = [ "$externs_path/developer_private.js" ]
 }
 
+js_library("keyboard_shortcut_delegate") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
+  externs_list = [ "$externs_path/developer_private.js" ]
+}
+
 js_library("keyboard_shortcuts") {
   deps = [
     ":item_behavior",
+    ":keyboard_shortcut_delegate",
     "//ui/webui/resources/cr_elements:cr_container_shadow_behavior",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:cr",
@@ -324,6 +335,7 @@ js_library("service") {
   deps = [
     ":error_page",
     ":item",
+    ":keyboard_shortcut_delegate",
     ":load_error",
     ":navigation_helper",
     ":pack_dialog",
@@ -345,6 +357,7 @@ js_library("service") {
 
 js_library("shortcut_input") {
   deps = [
+    ":keyboard_shortcut_delegate",
     ":shortcut_util",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:cr",