commit 0212c10fb04acbbae85ae505cee2d0cd7c075ccc
author Hongyu Long <hongyulong@chromium.org> Fri May 24 03:46:18 2024
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 24 03:46:18 2024
tree 5ad38a88774ba3042355017b5809c8b3e8a79ef4
parent b372d95b8b33de82383c74352e3911d78add86d9

Use ash_internal_scaled_resources in ash

This CL will use the new .grd into the ash, so that the focus mode can
use the YouTube Music icon which already added into the internal repo.
The internal CL is: https://crrev.com/i/7152437

Bug: b/332922522
Change-Id: Ie51670d2d90697c4649d807ed1f8664120706400
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5564508
Reviewed-by: Sean Kau <skau@chromium.org>
Commit-Queue: Hongyu Long <hongyulong@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1305497}

ash/BUILD.gn

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index e6f3342..a7ce2c7e 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -3411,7 +3411,10 @@
   }
 
   if (is_chrome_branded) {
-    deps += [ "//chromeos/ash/resources/internal/strings" ]
+    deps += [
+      "//chromeos/ash/resources/internal:ash_internal_scaled_resources",
+      "//chromeos/ash/resources/internal/strings",
+    ]
   }
 }
 

ash/resources/BUILD.gn

diff --git a/ash/resources/BUILD.gn b/ash/resources/BUILD.gn
index 4ad507e..7931b92f 100644
--- a/ash/resources/BUILD.gn
+++ b/ash/resources/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//ash/ambient/resources/resources.gni")
+import("//build/config/chrome_build.gni")
 import("//build/config/chromeos/ui_mode.gni")
 import("//chromeos/ash/components/scalable_iph/scalable_iph.gni")
 import("//tools/grit/repack.gni")
@@ -76,6 +77,12 @@
       deps += invoker.deps
     }
 
+    if (is_chrome_branded) {
+      sources += [ "$root_gen_dir/chromeos/ash/resources/internal/ash_internal_resources_${percent}_percent.pak" ]
+      deps +=
+          [ "//chromeos/ash/resources/internal:ash_internal_scaled_resources" ]
+    }
+
     if (percent == "100") {
       # TODO(msw): This seems bad, but follows repack_ui_test_pak's example.
       deps += [ "//third_party/blink/public:resources_grit" ]

chrome/chrome_paks.gni

diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index b87ecec..5f7320e 100644
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//ash/ambient/resources/resources.gni")
+import("//build/config/chrome_build.gni")
 import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/locales.gni")
 import("//chrome/browser/buildflags.gni")
@@ -81,6 +82,12 @@
         "//chrome/browser/resources/chromeos:app_icon_resources",
         "//ui/chromeos/resources",
       ]
+      if (is_chrome_branded) {
+        sources += [ "$root_gen_dir/chromeos/ash/resources/internal/ash_internal_resources_${percent}_percent.pak" ]
+        deps += [
+          "//chromeos/ash/resources/internal:ash_internal_scaled_resources",
+        ]
+      }
     }
     if (enable_extensions) {
       sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${percent}_percent.pak" ]

tools/gritsettings/resource_ids.spec

diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 3ee32ca03..0f31cc4 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -778,6 +778,9 @@
   "chromeos/ash/resources/ash_resources.grd": {
     "includes": [5760],
   },
+  "chromeos/ash/resources/internal/ash_internal_scaled_resources.grd": {
+    "structures": [5770],
+  },
   "chromeos/ash/resources/internal/ash_internal_strings.grd": {
     "messages": [5780],
   },