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

Side by Side Diff: ash/mus/BUILD.gn

Issue 2378193002: mustash: Show networking items in ash system tray (Closed)
Patch Set: typo Created 4 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//mojo/public/tools/bindings/mojom.gni") 6 import("//mojo/public/tools/bindings/mojom.gni")
7 import("//services/shell/public/cpp/service.gni") 7 import("//services/shell/public/cpp/service.gni")
8 import("//services/shell/public/service_manifest.gni") 8 import("//services/shell/public/service_manifest.gni")
9 import("//tools/grit/repack.gni") 9 import("//tools/grit/repack.gni")
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 "screenlock_layout.cc", 70 "screenlock_layout.cc",
71 "screenlock_layout.h", 71 "screenlock_layout.h",
72 "shadow.cc", 72 "shadow.cc",
73 "shadow.h", 73 "shadow.h",
74 "shadow_controller.cc", 74 "shadow_controller.cc",
75 "shadow_controller.h", 75 "shadow_controller.h",
76 "shelf_delegate_mus.cc", 76 "shelf_delegate_mus.cc",
77 "shelf_delegate_mus.h", 77 "shelf_delegate_mus.h",
78 "shell_delegate_mus.cc", 78 "shell_delegate_mus.cc",
79 "shell_delegate_mus.h", 79 "shell_delegate_mus.h",
80 "system_tray_delegate_mus.cc",
81 "system_tray_delegate_mus.h",
82 "wallpaper_delegate_mus.cc", 80 "wallpaper_delegate_mus.cc",
83 "wallpaper_delegate_mus.h", 81 "wallpaper_delegate_mus.h",
84 "window_manager.cc", 82 "window_manager.cc",
85 "window_manager.h", 83 "window_manager.h",
86 "window_manager_application.cc", 84 "window_manager_application.cc",
87 "window_manager_application.h", 85 "window_manager_application.h",
88 "window_manager_observer.h", 86 "window_manager_observer.h",
89 ] 87 ]
90 88
91 defines = [ "NOTIMPLEMENTED_POLICY=5" ] 89 defines = [ "NOTIMPLEMENTED_POLICY=5" ]
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 "//ui/views", 123 "//ui/views",
126 "//ui/views/mus:for_mojo_application", 124 "//ui/views/mus:for_mojo_application",
127 "//ui/wm", 125 "//ui/wm",
128 ] 126 ]
129 127
130 data_deps = [ 128 data_deps = [
131 "//ash/touch_hud/mus:touch_hud", 129 "//ash/touch_hud/mus:touch_hud",
132 ] 130 ]
133 131
134 if (is_chromeos) { 132 if (is_chromeos) {
133 sources += [
134 "system_tray_delegate_mus.cc",
135 "system_tray_delegate_mus.h",
136 "vpn_delegate_mus.cc",
137 "vpn_delegate_mus.h",
138 ]
139
135 deps += [ 140 deps += [
136 "//chromeos", 141 "//chromeos",
137 "//chromeos:power_manager_proto", 142 "//chromeos:power_manager_proto",
138 "//device/bluetooth", 143 "//device/bluetooth",
139 ] 144 ]
140 } 145 }
141 } 146 }
142 147
143 service("mus") { 148 service("mus") {
144 output_name = "ash" 149 output_name = "ash"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", 190 "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak",
186 ] 191 ]
187 deps = [ 192 deps = [
188 "//ash/common/strings", 193 "//ash/common/strings",
189 "//ash/resources", 194 "//ash/resources",
190 "//ui/resources", 195 "//ui/resources",
191 "//ui/strings", 196 "//ui/strings",
192 "//ui/views/mus:resources", 197 "//ui/views/mus:resources",
193 "//ui/views/resources", 198 "//ui/views/resources",
194 ] 199 ]
200
201 if (is_chromeos) {
202 sources += [
203 "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak ",
204 "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak",
205 ]
206 deps += [
207 "//ui/chromeos/resources",
208 "//ui/chromeos/strings",
209 ]
210 }
195 } 211 }
196 212
197 repack("resources_200") { 213 repack("resources_200") {
198 output = "$root_out_dir/ash_mus_resources_200.pak" 214 output = "$root_out_dir/ash_mus_resources_200.pak"
199 sources = [ 215 sources = [
200 "$root_gen_dir/ash/resources/ash_resources_200_percent.pak", 216 "$root_gen_dir/ash/resources/ash_resources_200_percent.pak",
201 "$root_gen_dir/ui/resources/ui_resources_200_percent.pak", 217 "$root_gen_dir/ui/resources/ui_resources_200_percent.pak",
202 "$root_gen_dir/ui/views/resources/views_resources_200_percent.pak", 218 "$root_gen_dir/ui/views/resources/views_resources_200_percent.pak",
203 ] 219 ]
204 deps = [ 220 deps = [
205 "//ash/resources", 221 "//ash/resources",
206 "//ui/resources", 222 "//ui/resources",
207 "//ui/views/resources", 223 "//ui/views/resources",
208 ] 224 ]
225
226 if (is_chromeos) {
227 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_200_ percent.pak" ]
228 deps += [ "//ui/chromeos/resources" ]
229 }
209 } 230 }
210 231
211 source_set("unittests") { 232 source_set("unittests") {
212 testonly = true 233 testonly = true
213 234
214 sources = [ 235 sources = [
215 "../common/wm_window_unittest.cc", 236 "../common/wm_window_unittest.cc",
216 "accelerators/accelerator_controller_registrar_test_api.cc", 237 "accelerators/accelerator_controller_registrar_test_api.cc",
217 "accelerators/accelerator_controller_registrar_test_api.h", 238 "accelerators/accelerator_controller_registrar_test_api.h",
218 "accelerators/accelerator_controller_unittest.cc", 239 "accelerators/accelerator_controller_unittest.cc",
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 "//ui/views/mus", 286 "//ui/views/mus",
266 ] 287 ]
267 288
268 data_deps = [ 289 data_deps = [
269 ":mus", 290 ":mus",
270 "//mash/quick_launch", 291 "//mash/quick_launch",
271 ] 292 ]
272 293
273 defines = [ "NOTIMPLEMENTED_POLICY=5" ] 294 defines = [ "NOTIMPLEMENTED_POLICY=5" ]
274 } 295 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698