1 files changed, 28 insertions, 25 deletions

diff --git a/chromium/ui/webui/resources/cr_components/history_clusters/BUILD.gn b/chromium/ui/webui/resources/cr_components/history_clusters/BUILD.gn
index cc3758de4f3..5d11b25852f 100644
--- a/chromium/ui/webui/resources/cr_components/history_clusters/BUILD.gn
+++ b/chromium/ui/webui/resources/cr_components/history_clusters/BUILD.gn
@@ -8,6 +8,7 @@ import("//tools/polymer/css_to_wrapper.gni")
 import("//tools/polymer/html_to_wrapper.gni")
 import("//tools/typescript/ts_library.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
+import("//ui/webui/webui_features.gni")
 import("history_clusters.gni")
 
 assert(!is_android)
@@ -22,17 +23,33 @@ mojom("mojo_bindings") {
   sources = [ "history_clusters.mojom" ]
   public_deps = [
     "//mojo/public/mojom/base",
+    "//ui/base/mojom",
+    "//ui/gfx/geometry/mojom",
     "//url/mojom:url_mojom_gurl",
   ]
   webui_module_path = "chrome://resources/cr_components/history_clusters/"
 }
 
+preprocess_if_expr("preprocess") {
+  in_folder = "."
+  out_folder = preprocess_folder_tmp
+  in_files = ts_files + html_files + css_files
+}
+
 css_to_wrapper("css_wrapper_files") {
+  deps = [ ":preprocess" ]
+  in_folder = preprocess_folder_tmp
+  out_folder = preprocess_folder_tmp
   in_files = css_files
+  minify = optimize_webui
 }
 
 html_to_wrapper("html_wrapper_files") {
+  deps = [ ":preprocess" ]
+  in_folder = preprocess_folder_tmp
+  out_folder = preprocess_folder_tmp
   in_files = html_files
+  minify = optimize_webui
 }
 
 copy("copy_history_clusters_mojom") {
@@ -41,30 +58,6 @@ copy("copy_history_clusters_mojom") {
   deps = [ ":mojo_bindings_webui_js" ]
 }
 
-generate_grd("build_grdp") {
-  grd_prefix = "cr_components_history_clusters"
-  out_grd = "$target_gen_dir/resources.grdp"
-  public_deps = [ ":build_ts" ]
-  manifest_files = [ "$target_gen_dir/tsconfig.manifest" ]
-  resource_path_prefix = "cr_components/history_clusters"
-}
-
-preprocess_if_expr("preprocess") {
-  in_folder = "."
-  out_folder = preprocess_folder_tmp
-  in_files = ts_files
-}
-
-preprocess_if_expr("preprocess_generated") {
-  deps = [
-    ":css_wrapper_files",
-    ":html_wrapper_files",
-  ]
-  in_folder = target_gen_dir
-  out_folder = preprocess_folder_tmp
-  in_files = html_wrapper_files + css_wrapper_files
-}
-
 ts_library("build_ts") {
   root_dir = preprocess_folder_tmp
   out_dir = preprocess_folder
@@ -80,7 +73,17 @@ ts_library("build_ts") {
   definitions = [ "//tools/typescript/definitions/metrics_private.d.ts" ]
   extra_deps = [
     ":copy_history_clusters_mojom",
+    ":css_wrapper_files",
+    ":html_wrapper_files",
     ":preprocess",
-    ":preprocess_generated",
   ]
 }
+
+generate_grd("build_grdp") {
+  grd_prefix = "cr_components_history_clusters"
+  out_grd = "$target_gen_dir/resources.grdp"
+  public_deps = [ ":build_ts" ]
+  manifest_files =
+      filter_include(get_target_outputs(":build_ts"), [ "*.manifest" ])
+  resource_path_prefix = "cr_components/history_clusters"
+}