WebUI: Auto-generate grd file for chrome://webapks.

In the process, removed flattenhtml=true to stop inlining
about_webapks.css, and serving it from its own URL instead.

Also updating invalidations_ui.cc to use webui::AddResourcePathsBulk()
which was forgotten in a previous similar CL.

Bug: 1132403
Change-Id: I4b399d344bdb684e8f75e1261cdb4f64f7fb94ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2612096
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840842}

chrome/browser/resources/BUILD.gn

@@ -283,8 +283,8 @@ repack("dev_ui_paks") {
   ]
 
   if (is_android) {
-    sources += [ "$root_gen_dir/chrome/webapks_ui_resources.pak" ]
-    deps += [ "//chrome/browser/resources/webapks:webapks_ui_resources" ]
+    sources += [ "$root_gen_dir/chrome/webapks_resources.pak" ]
+    deps += [ "//chrome/browser/resources/webapks:webapks_resources" ]
   }
 }
 

chrome/browser/resources/webapks/BUILD.gn

@@ -5,6 +5,7 @@
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
 
 js_type_check("closure_compile") {
   uses_js_modules = true
@@ -19,12 +20,27 @@ js_library("about_webapks") {
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-grit("webapks_ui_resources") {
-  source = "webapks_ui_resources.grd"
+generate_grd("build_grd") {
+  grd_prefix = "webapks"
+  out_grd = "$target_gen_dir/resources.grd"
+  input_files = [
+    "about_webapks.css",
+    "about_webapks.html",
+    "about_webapks.js",
+  ]
+  input_files_base_dir = rebase_path(".", "//")
+}
+
+grit("webapks_resources") {
+  source = "$target_gen_dir/resources.grd"
+  deps = [ ":build_grd" ]
+  enable_input_discovery_for_gn_analyze = false
   defines = chrome_grit_defines
   outputs = [
-    "grit/webapks_ui_resources.h",
-    "webapks_ui_resources.pak",
+    "grit/webapks_resources.h",
+    "grit/webapks_resources_map.cc",
+    "grit/webapks_resources_map.h",
+    "webapks_resources.pak",
   ]
   output_dir = "$root_gen_dir/chrome"
 }

chrome/browser/resources/webapks/webapks_ui_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/webapks_ui_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="webapks_ui_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include name="IDR_WEBAPKS_UI_CSS" file="about_webapks.css" type="BINDATA" />
-      <include name="IDR_WEBAPKS_UI_HTML" file="about_webapks.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-      <include name="IDR_WEBAPKS_UI_JS" file="about_webapks.js" type="BINDATA" />
-    </includes>
-  </release>
-</grit>

chrome/browser/ui/BUILD.gn

@@ -805,7 +805,7 @@ static_library("ui") {
       "//chrome/android:jni_headers",
       "//chrome/android/features/dev_ui:buildflags",
       "//chrome/browser/image_decoder",
-      "//chrome/browser/resources/webapks:webapks_ui_resources",
+      "//chrome/browser/resources/webapks:webapks_resources",
       "//components/autofill_assistant/browser",
       "//components/autofill_assistant/browser:proto",
       "//components/browser_ui/client_certificate/android",

chrome/browser/ui/webui/invalidations/invalidations_ui.cc

@@ -8,8 +8,10 @@
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/invalidations/invalidations_message_handler.h"
+#include "chrome/browser/ui/webui/webui_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/invalidations_resources.h"
+#include "chrome/grit/invalidations_resources_map.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
@@ -26,10 +28,9 @@ content::WebUIDataSource* CreateInvalidationsHTMLSource() {
   source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::TrustedTypes,
       "trusted-types jstemplate;");
-  source->AddResourcePath("about_invalidations.js",
-                          IDR_INVALIDATIONS_ABOUT_INVALIDATIONS_JS);
-  source->AddResourcePath("about_invalidations.css",
-                          IDR_INVALIDATIONS_ABOUT_INVALIDATIONS_CSS);
+  webui::AddResourcePathsBulk(
+      source,
+      base::make_span(kInvalidationsResources, kInvalidationsResourcesSize));
   source->SetDefaultResource(IDR_INVALIDATIONS_ABOUT_INVALIDATIONS_HTML);
   return source;
 }

chrome/browser/ui/webui/webapks/webapks_ui.cc

@@ -9,8 +9,10 @@
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/webapks/webapks_handler.h"
+#include "chrome/browser/ui/webui/webui_util.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/grit/webapks_ui_resources.h"
+#include "chrome/grit/webapks_resources.h"
+#include "chrome/grit/webapks_resources_map.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 
@@ -22,9 +24,10 @@ WebUIDataSource* CreateWebApksUIDataSource() {
   WebUIDataSource* html_source =
       WebUIDataSource::Create(chrome::kChromeUIWebApksHost);
   html_source->UseStringsJs();
-  html_source->AddResourcePath("webapks.js", IDR_WEBAPKS_UI_JS);
-  html_source->AddResourcePath("about_webapks.css", IDR_WEBAPKS_UI_CSS);
-  html_source->SetDefaultResource(IDR_WEBAPKS_UI_HTML);
+
+  webui::AddResourcePathsBulk(
+      html_source, base::make_span(kWebapksResources, kWebapksResourcesSize));
+  html_source->SetDefaultResource(IDR_WEBAPKS_ABOUT_WEBAPKS_HTML);
 
   return html_source;
 }

tools/gritsettings/resource_ids.spec

@@ -263,7 +263,8 @@
     "META": {"sizes": {"includes": [20]}},
     "includes": [2200],
   },
-  "chrome/browser/resources/webapks/webapks_ui_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/webapks/resources.grd": {
+    "META": {"sizes": {"includes": [10]}},
     "includes": [2220],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/webui_js_error/webui_js_error_resources.grd": {