[DevUI DFM] Move chrome://omnibox resources to the DFM

Moves resources used in chrome://omnibox out of browser_resources.grd
into its own GRD file. Moves those resources into the Dev UI DFM to
save binary size on Chrome Android.

Bug: 927131
Change-Id: Iabef47e999a5504969595b1d403123157fc338fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845823Reviewed-by: Dan Beam <dbeam@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Auto-Submit: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703721}

chrome/browser/browser_resources.grd

@@ -288,16 +288,6 @@
       <include name="IDR_LOCAL_STATE_HTML" file="resources\local_state\local_state.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
       <include name="IDR_LOCAL_STATE_JS" file="resources\local_state\local_state.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
       <include name="IDR_DESKTOP_HATS_HTML" file="resources\hats\hats.html" type="BINDATA" />
-      <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
-      <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type="BINDATA" compress="gzip" />
-      <include name="IDR_OMNIBOX_INPUT_CSS" file="resources\omnibox\omnibox_input.css" type="BINDATA" compress="gzip" />
-      <include name="IDR_OUTPUT_RESULTS_GROUP_CSS" file="resources\omnibox\output_results_group.css" type="BINDATA" compress="gzip" />
-      <include name="IDR_OMNIBOX_OUTPUT_COLUMN_WIDTHS_CSS" file="resources\omnibox\omnibox_output_column_widths.css" type="BINDATA" compress="gzip" />
-      <include name="IDR_OMNIBOX_ELEMENT_JS" file="resources\omnibox\omnibox_element.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_OMNIBOX_INPUT_JS" file="resources\omnibox\omnibox_input.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_OMNIBOX_OUTPUT_JS" file="resources\omnibox\omnibox_output.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_OMNIBOX_MOJO_JS" file="${root_gen_dir}\chrome\browser\ui\webui\omnibox\omnibox.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
       <include name="IDR_ORIGIN_MOJO_JS" file="${root_gen_dir}\url\mojom\origin.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip"/>
       <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
       <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BINDATA" compress="gzip" />

chrome/browser/resources/BUILD.gn

@@ -362,10 +362,12 @@ repack("dev_ui_paks") {
 
   sources = [
     "$root_gen_dir/chrome/bluetooth_internals_resources.pak",
+    "$root_gen_dir/chrome/omnibox_resources.pak",
     "$root_gen_dir/chrome/usb_internals_resources.pak",
   ]
   deps = [
     "//chrome/browser/resources/bluetooth_internals:resources",
+    "//chrome/browser/resources/omnibox:resources",
     "//chrome/browser/resources/usb_internals:resources",
   ]
 }

chrome/browser/resources/omnibox/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/grit/grit_rule.gni")
 
 js_type_check("closure_compile") {
   deps = [
@@ -32,3 +33,23 @@ js_library("omnibox_output") {
   ]
   externs_list = [ "$externs_path/pending.js" ]
 }
+
+grit("resources") {
+  source = "resources.grd"
+
+  # The .grd contains references to generated files.
+  source_is_generated = true
+  outputs = [
+    "grit/omnibox_resources.h",
+    "omnibox_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+  depfile_dir = target_gen_dir
+  grit_flags = [
+    "-E",
+    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+  ]
+  deps = [
+    "//chrome/browser/ui/webui/omnibox:mojo_bindings_js",
+  ]
+}

chrome/browser/resources/omnibox/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/omnibox_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="omnibox_resources.pak" type="data_package" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <include name="IDR_OMNIBOX_HTML"
+               file="omnibox.html"
+               flattenhtml="true"
+               allowexternalscript="true"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OMNIBOX_CSS"
+               file="omnibox.css"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OMNIBOX_INPUT_CSS"
+               file="omnibox_input.css"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OUTPUT_RESULTS_GROUP_CSS"
+               file="output_results_group.css"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OMNIBOX_OUTPUT_COLUMN_WIDTHS_CSS"
+               file="omnibox_output_column_widths.css"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OMNIBOX_ELEMENT_JS"
+               file="omnibox_element.js"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OMNIBOX_INPUT_JS"
+               file="omnibox_input.js"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OMNIBOX_OUTPUT_JS"
+               file="omnibox_output.js"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OMNIBOX_JS"
+               file="omnibox.js"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_OMNIBOX_MOJO_JS"
+               file="${root_gen_dir}\chrome\browser\ui\webui\omnibox\omnibox.mojom-lite.js"
+               use_base_dir="false"
+               type="BINDATA"
+               compress="gzip" />
+    </includes>
+  </release>
+</grit>

chrome/browser/ui/BUILD.gn

@@ -400,6 +400,7 @@ jumbo_split_static_library("ui") {
     "//chrome/browser/media:mojo_bindings",
     "//chrome/browser/notifications/scheduler/public",
     "//chrome/browser/profiling_host",
+    "//chrome/browser/resources/omnibox:resources",
     "//chrome/browser/resources/usb_internals:resources",
     "//chrome/browser/safe_browsing",
     "//chrome/browser/ssl:proto",

chrome/browser/ui/webui/omnibox/omnibox_ui.cc

@@ -12,7 +12,7 @@
 #include "chrome/browser/ui/webui/version_handler.h"
 #include "chrome/browser/ui/webui/version_ui.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/grit/browser_resources.h"
+#include "chrome/grit/omnibox_resources.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_data_source.h"

tools/gritsettings/resource_ids

@@ -166,6 +166,9 @@
   "chrome/browser/resources/bluetooth_internals/resources.grd": {
     "includes": [13970],
   },
+  "chrome/browser/resources/omnibox/resources.grd": {
+    "includes": [14000],
+  },
   "chrome/browser/resources/usb_internals/resources.grd": {
     "includes": [14030],
   },