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

Unified Diff: chrome/chrome_paks.gni

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)
Patch Set: smaller CL, only with crucial bits (see comment #53) 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
Index: chrome/chrome_paks.gni
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index 8b1ec9ba64e221751d889a8dfe078c29e76d4851..bac23c8cc9f75c494ee331eeb620fbf2be9d6fc0 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) {
+ # TODO(tonikitoo): Chrome/ozone support is in progress, and temporarily runs
+ # with --mash only. In order to avoid some icons in Ash's window manager
+ # session, (ab)use some ash resources.
+ if (use_ash || use_ozone) {
sources +=
[ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]
deps += [ "//ash/resources" ]

Powered by Google App Engine
This is Rietveld 408576698