1 files changed, 105 insertions, 13 deletions

diff --git a/chromium/chrome/browser/resources/BUILD.gn b/chromium/chrome/browser/resources/BUILD.gn
index c5f813e5c89..0f428df836e 100644
--- a/chromium/chrome/browser/resources/BUILD.gn
+++ b/chromium/chrome/browser/resources/BUILD.gn
@@ -6,12 +6,13 @@ import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//chrome/test/include_js_tests.gni")
 import("//components/nacl/features.gni")
+import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 
 assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome")
 
-if (closure_compile) {
+if (enable_js_type_check) {
   group("closure_compile") {
     deps = [
       "components:closure_compile",
@@ -34,6 +35,8 @@ if (closure_compile) {
         "local_state:closure_compile",
         "management:closure_compile",
         "media_router:closure_compile",
+        "nearby_internals:closure_compile",
+        "nearby_share:closure_compile",
         "new_tab_page:closure_compile",
         "ntp4:closure_compile",
         "omnibox:closure_compile",
@@ -45,6 +48,7 @@ if (closure_compile) {
         "signin:closure_compile",
         "usb_internals:closure_compile",
         "user_manager:closure_compile",
+        "web_app_internals:closure_compile",
         "welcome:closure_compile",
       ]
     }
@@ -67,6 +71,7 @@ if (closure_compile) {
       deps += [
         "explore_sites_internals:closure_compile",
         "feed_internals:closure_compile",
+        "internals/query_tiles:closure_compile",
         "offline_pages:closure_compile",
         "snippets_internals:closure_compile",
         "webapks:closure_compile",
@@ -121,7 +126,7 @@ if (!is_android) {
       "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
     ]
 
-    deps = [ "//chrome/browser/resources/pdf/elements:web_components" ]
+    deps = [ "//chrome/browser/resources/pdf:web_components" ]
 
     defines = chrome_grit_defines
     if (enable_hangout_services_extension) {
@@ -192,6 +197,46 @@ if (!is_android) {
     output_dir = "$root_gen_dir/chrome"
   }
 
+  grit("nearby_internals_resources") {
+    source = "nearby_internals/nearby_internals_resources.grd"
+
+    grit_flags = [
+      "-E",
+      "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+    ]
+
+    deps = [ "//chrome/browser/resources/nearby_internals:web_components" ]
+
+    defines = chrome_grit_defines
+    outputs = [
+      "grit/nearby_internals_resources.h",
+      "grit/nearby_internals_resources_map.cc",
+      "grit/nearby_internals_resources_map.h",
+      "nearby_internals_resources.pak",
+    ]
+    output_dir = "$root_gen_dir/chrome"
+  }
+
+  grit("nearby_share_dialog_resources") {
+    source = "nearby_share/nearby_share_dialog_resources.grd"
+
+    grit_flags = [
+      "-E",
+      "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+    ]
+
+    deps = [ "//chrome/browser/resources/nearby_share:web_components" ]
+
+    defines = chrome_grit_defines
+    outputs = [
+      "grit/nearby_share_dialog_resources.h",
+      "grit/nearby_share_dialog_resources_map.cc",
+      "grit/nearby_share_dialog_resources_map.h",
+      "nearby_share_dialog_resources.pak",
+    ]
+    output_dir = "$root_gen_dir/chrome"
+  }
+
   grit("new_tab_page_resources") {
     if (optimize_webui) {
       source = "new_tab_page/new_tab_page_resources_vulcanized.grd"
@@ -289,11 +334,16 @@ if (is_chromeos) {
       enable_input_discovery_for_gn_analyze = false
       source = "settings/os_settings_resources_vulcanized.grd"
 
-      deps += [ "//chrome/browser/resources/settings/chromeos:build" ]
+      deps += [
+        "//chrome/browser/resources/settings/chromeos:build",
+        "//chrome/browser/resources/settings/chromeos:build_polymer3",
+      ]
     } else {
       source = "settings/os_settings_resources.grd"
-      deps +=
-          [ "//chrome/browser/resources/settings/chromeos:polymer3_elements" ]
+      deps += [
+        "//chrome/browser/resources/settings/chromeos:polymer3_elements",
+        "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js",
+      ]
     }
 
     defines = chrome_grit_defines
@@ -305,6 +355,34 @@ if (is_chromeos) {
     ]
     output_dir = "$root_gen_dir/chrome"
   }
+
+  grit("bluetooth_pairing_dialog_resources") {
+    grit_flags = [
+      "-E",
+      "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+    ]
+
+    if (optimize_webui) {
+      source = "chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources_vulcanized.grd"
+
+      deps = [
+        "//chrome/browser/resources/chromeos/bluetooth_pairing_dialog:build",
+      ]
+    } else {
+      source = "chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources.grd"
+
+      deps = [ "//chrome/browser/resources/chromeos/bluetooth_pairing_dialog:web_components" ]
+    }
+
+    defines = chrome_grit_defines
+    outputs = [
+      "grit/bluetooth_pairing_dialog_resources.h",
+      "grit/bluetooth_pairing_dialog_resources_map.cc",
+      "grit/bluetooth_pairing_dialog_resources_map.h",
+      "bluetooth_pairing_dialog_resources.pak",
+    ]
+    output_dir = "$root_gen_dir/chrome"
+  }
 }
 
 if (!is_android && !is_chromeos) {
@@ -330,6 +408,7 @@ if (!is_android && !is_chromeos) {
   grit("profile_picker_resources") {
     source = "signin/profile_picker/profile_picker_resources.grd"
 
+    deps = [ "//chrome/browser/resources/signin/profile_picker:web_components" ]
     grit_flags = [
       "-E",
       "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
@@ -393,16 +472,10 @@ if (enable_print_preview) {
 
     if (optimize_webui) {
       source = "print_preview/print_preview_resources_vulcanized.grd"
-      deps = [
-        "//chrome/browser/resources/pdf/elements:web_components",
-        "//chrome/browser/resources/print_preview:build",
-      ]
+      deps = [ "//chrome/browser/resources/print_preview:build" ]
     } else {
       source = "print_preview/print_preview_resources.grd"
-      deps = [
-        "//chrome/browser/resources/pdf/elements:web_components",
-        "//chrome/browser/resources/print_preview/ui:web_components",
-      ]
+      deps = [ "//chrome/browser/resources/print_preview/ui:web_components" ]
     }
 
     defines = chrome_grit_defines
@@ -414,6 +487,25 @@ if (enable_print_preview) {
     ]
     output_dir = "$root_gen_dir/chrome"
   }
+
+  grit("print_preview_pdf_resources") {
+    grit_flags = [
+      "-E",
+      "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+    ]
+
+    source = "print_preview/print_preview_pdf_resources.grd"
+    deps = [ "//chrome/browser/resources/pdf:web_components" ]
+
+    defines = chrome_grit_defines
+    outputs = [
+      "grit/print_preview_pdf_resources.h",
+      "grit/print_preview_pdf_resources_map.cc",
+      "grit/print_preview_pdf_resources_map.h",
+      "print_preview_pdf_resources.pak",
+    ]
+    output_dir = "$root_gen_dir/chrome"
+  }
 }
 
 if (enable_webui_tab_strip) {