Welcome WebUI: Auto-generate grd file.

Bug: 1132403
Change-Id: I7fb7561cf7a808fe26420dae42814e5f41072b71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2470305
Commit-Queue: John Lee <johntlee@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817670}

chrome/browser/resources/BUILD.gn

@@ -499,15 +499,23 @@ if (is_chromeos) {
 
 if (!is_android && !is_chromeos) {
   grit("welcome_resources") {
-    source = "welcome/welcome_resources.grd"
-
-    deps = [ "//chrome/browser/resources/welcome:web_components" ]
     grit_flags = [
       "-E",
       "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+      "-E",
+      "root_src_dir=" + rebase_path("//", root_build_dir),
     ]
 
     defines = chrome_grit_defines
+
+    # These arguments are needed since the grd is generated at build time.
+    enable_input_discovery_for_gn_analyze = false
+    defines += [ "SHARED_INTERMEDIATE_DIR=" +
+                 rebase_path(root_gen_dir, root_build_dir) ]
+    welcome_gen_dir = "$root_gen_dir/chrome/browser/resources/welcome"
+    source = "$welcome_gen_dir/welcome_resources.grd"
+    deps = [ "//chrome/browser/resources/welcome:build_grd" ]
+
     outputs = [
       "grit/welcome_resources.h",
       "grit/welcome_resources_map.cc",

chrome/browser/resources/welcome/BUILD.gn

@@ -3,7 +3,82 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/grit/preprocess_grit.gni")
 import("//tools/polymer/html_to_js.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
+
+preprocess_folder = "preprocessed"
+preprocess_manifest = "preprocessed_manifest.json"
+preprocess_gen_manifest = "preprocessed_gen_manifest.json"
+
+generate_grd("build_grd") {
+  grd_prefix = "welcome"
+  out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
+  input_files = [
+    "images/background_svgs/blue_circle.svg",
+    "images/background_svgs/green_rectangle.svg",
+    "images/background_svgs/grey_oval.svg",
+    "images/background_svgs/grey_rounded_rectangle.svg",
+    "images/background_svgs/red_triangle.svg",
+    "images/background_svgs/yellow_dots.svg",
+    "images/background_svgs/yellow_semicircle.svg",
+    "welcome.html",
+    "welcome.css",
+  ]
+  input_files_base_dir = rebase_path(".", "//")
+
+  deps = [
+    ":preprocess",
+    ":preprocess_generated",
+  ]
+  manifest_files = [
+    "$target_gen_dir/$preprocess_manifest",
+    "$target_gen_dir/$preprocess_gen_manifest",
+  ]
+}
+
+preprocess_grit("preprocess") {
+  in_folder = "./"
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_manifest"
+  in_files = [
+    "google_apps/google_app_proxy.js",
+    "google_apps/google_apps_metrics_proxy.js",
+    "landing_view_proxy.js",
+    "navigation_behavior.js",
+    "ntp_background/ntp_background_metrics_proxy.js",
+    "ntp_background/ntp_background_proxy.js",
+    "set_as_default/nux_set_as_default_proxy.js",
+    "shared/bookmark_proxy.js",
+    "shared/module_metrics_proxy.js",
+    "shared/nux_types.js",
+    "signin_view_proxy.js",
+    "welcome_browser_proxy.js",
+    "welcome.js",
+  ]
+}
+
+preprocess_grit("preprocess_generated") {
+  deps = [ ":web_components" ]
+  in_folder = target_gen_dir
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
+  in_files = [
+    "google_apps/nux_google_apps.js",
+    "landing_view.js",
+    "ntp_background/nux_ntp_background.js",
+    "set_as_default/nux_set_as_default.js",
+    "shared/action_link_style_css.js",
+    "shared/animations_css.js",
+    "shared/chooser_shared_css.js",
+    "shared/navi_colors_css.js",
+    "shared/onboarding_background.js",
+    "shared/splash_pages_shared_css.js",
+    "shared/step_indicator.js",
+    "signin_view.js",
+    "welcome_app.js",
+  ]
+}
 
 group("closure_compile") {
   deps = [

chrome/browser/ui/webui/welcome/welcome_ui.cc

@@ -34,9 +34,6 @@
 
 namespace {
 
-constexpr char kGeneratedPath[] =
-    "@out_folder@/gen/chrome/browser/resources/welcome/";
-
 const char kPreviewBackgroundPath[] = "preview-background.jpg";
 
 bool ShouldHandleRequestCallback(base::WeakPtr<WelcomeUI> weak_ptr,
@@ -133,7 +130,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web_ui, const GURL& url)
       content::WebUIDataSource::Create(url.host());
   webui::SetupWebUIDataSource(
       html_source, base::make_span(kWelcomeResources, kWelcomeResourcesSize),
-      kGeneratedPath, IDR_WELCOME_HTML);
+      "", IDR_WELCOME_WELCOME_HTML);
 
   // Add welcome strings.
   AddStrings(html_source);

tools/gritsettings/resource_ids.spec

@@ -194,9 +194,9 @@
     "structures": [1900],
     "includes": [1920],
   },
-  "chrome/browser/resources/welcome/welcome_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/welcome/welcome_resources.grd": {
+    "META": {"sizes": {"includes": [30]}},
     "includes": [1940],
-    "structures": [1960],
   },
   "chrome/browser/supervised_user/supervised_user_unscaled_resources.grd": {
     "includes": [1970],