Reland WebUI: Auto-generated grd file for chrome://usb-internals.

Since the underlying issue with grit has been addressed, reland this
change.

Bug: 1132403, 1150466
Change-Id: Icdf25bae36b3f525f1b0319621dbbd112e95917f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566747
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832541}

chrome/browser/resources/usb_internals/BUILD.gn

@@ -5,6 +5,49 @@
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/polymer/html_to_js.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
+
+generated_grdp_file = "$target_gen_dir/generated_resources.grdp"
+mojo_grdp_file = "$target_gen_dir/mojo_resources.grdp"
+resources_grd_file = "$target_gen_dir/resources.grd"
+
+generate_grd("build_grd") {
+  grd_prefix = "usb_internals"
+  out_grd = resources_grd_file
+  deps = [
+    ":build_generated_grdp",
+    ":build_mojo_grdp",
+  ]
+  input_files = [
+    "descriptor_panel.js",
+    "devices_page.js",
+    "usb_internals.css",
+    "usb_internals.html",
+  ]
+  input_files_base_dir = rebase_path(".", "//")
+
+  grdp_files = [
+    generated_grdp_file,
+    mojo_grdp_file,
+  ]
+}
+
+generate_grd("build_generated_grdp") {
+  grd_prefix = "usb_internals"
+  out_grd = generated_grdp_file
+  input_files = [ "app.js" ]
+  input_files_base_dir = rebase_path(target_gen_dir, root_build_dir)
+}
+
+generate_grd("build_mojo_grdp") {
+  grd_prefix = "usb_internals"
+  out_grd = mojo_grdp_file
+  input_files = [ "usb_internals.mojom-webui.js" ]
+  input_files_base_dir =
+      rebase_path(
+          "${root_gen_dir}/mojom-webui/chrome/browser/ui/webui/usb_internals",
+          "$root_build_dir")
+}
 
 js_type_check("closure_compile") {
   uses_js_modules = true
@@ -57,7 +100,8 @@ js_library("descriptor_panel") {
 }
 
 grit("resources") {
-  source = "resources.grd"
+  enable_input_discovery_for_gn_analyze = false
+  source = resources_grd_file
   outputs = [
     "grit/usb_internals_resources.h",
     "grit/usb_internals_resources_map.cc",
@@ -66,6 +110,7 @@ grit("resources") {
   ]
   output_dir = "$root_gen_dir/chrome"
   deps = [
+    ":build_grd",
     ":web_components",
     "//chrome/browser/ui/webui/usb_internals:mojo_bindings_webui_js",
   ]

chrome/browser/resources/usb_internals/resources.grd

-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0"
-      current_release="1"
-      output_all_resource_defines="false">
-  <outputs>
-    <output filename="grit/usb_internals_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="grit/usb_internals_resources_map.cc"
-            type="resource_file_map_source" />
-    <output filename="grit/usb_internals_resources_map.h"
-           type="resource_map_header" />
-    <output filename="usb_internals_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include name="IDR_USB_INTERNALS_CSS"
-               file="usb_internals.css"
-               type="BINDATA" />
-      <include name="IDR_USB_INTERNALS_DESCRIPTOR_PANEL_JS"
-               file="descriptor_panel.js"
-               type="BINDATA" />
-      <include name="IDR_USB_INTERNALS_DEVICES_PAGE_JS"
-               file="devices_page.js"
-               type="BINDATA" />
-      <include name="IDR_USB_INTERNALS_HTML"
-               file="usb_internals.html"
-               type="BINDATA" />
-      <include name="IDR_USB_INTERNALS_MOJOM_WEBUI_JS"
-               file="${root_gen_dir}\mojom-webui\chrome\browser\ui\webui\usb_internals\usb_internals.mojom-webui.js"
-               resource_path="usb_internals.mojom-webui.js"
-               use_base_dir="false"
-               type="BINDATA" />
-      <include name="IDR_USB_INTERNALS_APP_JS"
-               file="${root_gen_dir}\chrome\browser\resources\usb_internals\app.js"
-               resource_path="app.js"
-               use_base_dir="false"
-               type="BINDATA" />
-    </includes>
-  </release>
-</grit>

chrome/browser/ui/webui/usb_internals/usb_internals_ui.cc

@@ -35,7 +35,7 @@ UsbInternalsUI::UsbInternalsUI(content::WebUI* web_ui)
   webui::SetupWebUIDataSource(
       source,
       base::make_span(kUsbInternalsResources, kUsbInternalsResourcesSize), "",
-      IDR_USB_INTERNALS_HTML);
+      IDR_USB_INTERNALS_USB_INTERNALS_HTML);
 
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), source);
 }

tools/gritsettings/resource_ids.spec

@@ -254,7 +254,8 @@
   "chrome/browser/resources/sync_file_system_internals/sync_file_system_internals_resources.grd": {
     "includes": [2180],
   },
-  "chrome/browser/resources/usb_internals/resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/usb_internals/resources.grd": {
+    "META": {"sizes": {"includes": [20]}},
     "includes": [2200],
   },
   "chrome/browser/resources/webapks/webapks_ui_resources.grd": {