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

Side by Side 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: fix ash_test_resources 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//tools/grit/grit_rule.gni") 5 import("//tools/grit/grit_rule.gni")
6 import("//tools/grit/repack.gni") 6 import("//tools/grit/repack.gni")
7 import("//ui/base/ui_features.gni") 7 import("//ui/base/ui_features.gni")
8 8
9 assert(enable_hidpi) 9 assert(enable_hidpi)
10 10
(...skipping 26 matching lines...) Expand all
37 ] 37 ]
38 } 38 }
39 39
40 deps = [ 40 deps = [
41 "//ash/resources", 41 "//ash/resources",
42 "//content:resources", 42 "//content:resources",
43 "//ui/resources", 43 "//ui/resources",
44 ] 44 ]
45 45
46 if (toolkit_views) { 46 if (toolkit_views) {
47 deps += [ "//ui/views/resources" ] 47 deps += [
48 sources += [ "$root_gen_dir/ui/views/resources/views_resources_${percent}_ percent.pak" ] 48 "//ui/app_list/resources",
49 "//ui/views/resources",
50 ]
51 sources += [
52 "$root_gen_dir/ui/app_list/resources/app_list_resources_${percent}_perce nt.pak",
53 "$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak ",
54 ]
49 55
50 if (percent == "100") { 56 if (percent == "100") {
51 # TODO(msw): This seems bad, but follows repack_ui_test_pak's example. 57 # TODO(msw): This seems bad, but follows repack_ui_test_pak's example.
52 deps += [ "//third_party/WebKit/public:resources_grit" ] 58 deps += [ "//third_party/WebKit/public:resources_grit" ]
53 sources += 59 sources +=
54 [ "$root_gen_dir/blink/public/resources/blink_resources.pak" ] 60 [ "$root_gen_dir/blink/public/resources/blink_resources.pak" ]
55 } 61 }
56 } 62 }
57 63
58 if (is_chromeos) { 64 if (is_chromeos) {
59 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${ percent}_percent.pak" ] 65 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${ percent}_percent.pak" ]
60 deps += [ "//ui/chromeos/resources" ] 66 deps += [ "//ui/chromeos/resources" ]
61 } 67 }
62
63 if (enable_app_list) {
64 sources += [ "$root_gen_dir/ui/app_list/resources/app_list_resources_${per cent}_percent.pak" ]
65 deps += [ "//ui/app_list/resources" ]
66 }
67 } 68 }
68 } 69 }
69 70
70 ash_test_resources("100_percent") { 71 ash_test_resources("100_percent") {
71 percent = "100" 72 percent = "100"
72 } 73 }
73 74
74 ash_test_resources("200_percent") { 75 ash_test_resources("200_percent") {
75 percent = "200" 76 percent = "200"
76 } 77 }
OLDNEW
« no previous file with comments | « ash/ash_resources.gyp ('k') | build/common.gypi » ('j') | testing/buildbot/chromium_trybot.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698