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

Unified Diff: ash/resources/BUILD.gn

Issue 1934213002: Set enable_app_list=1 now only on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160429-AppList0
Patch Set: Update ui_test_pak - should fix tests Created 4 years, 7 months 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 | « ash/ash_resources.gyp ('k') | build/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/resources/BUILD.gn
diff --git a/ash/resources/BUILD.gn b/ash/resources/BUILD.gn
index 3640ffe92bda629aa42558b7f440db6624fa723f..6f2fd27ee4154ceb5947fd8246eab8b70a31783c 100644
--- a/ash/resources/BUILD.gn
+++ b/ash/resources/BUILD.gn
@@ -44,8 +44,14 @@ template("ash_test_resources") {
]
if (toolkit_views) {
- deps += [ "//ui/views/resources" ]
- sources += [ "$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak" ]
+ deps += [
+ "//ui/app_list/resources",
+ "//ui/views/resources",
+ ]
+ sources += [
+ "$root_gen_dir/ui/app_list/resources/app_list_resources_${percent}_percent.pak",
+ "$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak",
+ ]
if (percent == "100") {
# TODO(msw): This seems bad, but follows repack_ui_test_pak's example.
@@ -59,11 +65,6 @@ template("ash_test_resources") {
sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak" ]
deps += [ "//ui/chromeos/resources" ]
}
-
- if (enable_app_list) {
- sources += [ "$root_gen_dir/ui/app_list/resources/app_list_resources_${percent}_percent.pak" ]
- deps += [ "//ui/app_list/resources" ]
- }
}
}
« no previous file with comments | « ash/ash_resources.gyp ('k') | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698