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

Unified Diff: chrome/chrome_repack_locales.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 | « chrome/chrome_paks.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_repack_locales.gni
diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
index 62706f125de6a70f1250d70cd9c2aece63b9aed6..91681b0d1d8407f3d16787f7a8ac79fcf6eac446 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/chrome/chrome_repack_locales.gni
@@ -5,6 +5,7 @@
import("//build/config/chrome_build.gni")
import("//build/config/features.gni")
import("//build/config/ui.gni")
+import("//chrome/common/features.gni")
import("//tools/grit/repack.gni")
# Wraps repack_locales(), setting the source_patterns and deps required for
@@ -40,7 +41,10 @@ template("chrome_repack_locales") {
deps += invoker.deps
}
- if (use_ash) {
+ # Chrome --mash in non-chromeos builds need to access some ash resources
+ # in order to avoid some missing localized strings in Ash's window manager session.
+ # TODO(tonikitoo): Remove this when a chrome/mus is available.
+ if (use_ash || enable_package_mash_services) {
source_patterns += [ "${root_gen_dir}/ash/common/strings/ash_strings_" ]
deps += [ "//ash/common/strings" ]
}
« no previous file with comments | « chrome/chrome_paks.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698