Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1450)

Unified Diff: chrome/chrome_paks.gni

Issue 2485673002: Bundle some ash resources into chrome for mash=1 use_ash=0 (Closed)
Patch Set: Bundle some ash resources into chrome for mash=1 use_ash=0 Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_repack_locales.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_paks.gni
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index 8b1ec9ba64e221751d889a8dfe078c29e76d4851..61afb481af55d09fe8289dd02ca25927ddcbfc2c 100644
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -51,7 +51,10 @@ template("chrome_repack_percent") {
deps += invoker.deps
}
- if (use_ash) {
+ # Chrome --mash in non-chromeos builds need to access some ash resources
+ # in order to avoid some missing icons in Ash's window manager session.
+ # TODO(tonikitoo): Remove this when a chrome/mus is available.
+ if (use_ash || enable_package_mash_services) {
sources +=
[ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]
deps += [ "//ash/resources" ]
« no previous file with comments | « no previous file | chrome/chrome_repack_locales.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698