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

Unified Diff: ash/mus/BUILD.gn

Issue 2112403002: NOSUBMIT: Initialize a StatusAreaWidget inside ash wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/common/wm_shell.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/BUILD.gn
diff --git a/ash/mus/BUILD.gn b/ash/mus/BUILD.gn
index 97ff79b14f22fda7c8bff77d139a34c5fab4cc40..46cec8e5d13d9ffcfae7d25eadcb99ec14c21430 100644
--- a/ash/mus/BUILD.gn
+++ b/ash/mus/BUILD.gn
@@ -78,10 +78,17 @@ source_set("lib") {
deps = [
"//components/user_manager",
+ # JAMES: Should these be public deps?
+ "//device/bluetooth",
+ "//ui/message_center",
]
public_deps = [
"//ash",
+#JAMES
+ "//ash/resources",
+ "//ash/strings",
+
"//ash/mus/resources",
"//ash/public/interfaces",
"//base",
@@ -104,6 +111,11 @@ source_set("lib") {
"//ui/views",
"//ui/views/mus:for_mojo_application",
]
+
+ # JAMES
+ if (is_chromeos) {
+ deps += [ "//chromeos" ]
+ }
}
mojo_native_application("mus") {
@@ -136,17 +148,23 @@ mojo_application_manifest("manifest") {
repack("resources") {
sources = [
+#JAMES - how to do ash strings?
+ "$root_out_dir/ash_test_strings.pak",
+
"$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak",
"$root_gen_dir/ash/resources/ash_resources_100_percent.pak",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
- "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
- "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
+# "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
+# "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
"$root_gen_dir/ui/views/resources/views_resources_100_percent.pak",
]
output = "$root_out_dir/ash_mus_resources.pak"
deps = [
"//ash/mus/resources",
"//ash/resources",
+#JAMES
+ "//ash/strings:ash_test_strings",
+
"//ui/resources",
"//ui/strings",
"//ui/views/mus:resources",
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698