| OLD | NEW |
| 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/mojo_application.gni") | 6 import("//mojo/public/mojo_application.gni") |
| 7 import("//mojo/public/mojo_application_manifest.gni") | 7 import("//mojo/public/mojo_application_manifest.gni") |
| 8 import("//mojo/public/tools/bindings/mojom.gni") | 8 import("//mojo/public/tools/bindings/mojom.gni") |
| 9 import("//tools/grit/repack.gni") | 9 import("//tools/grit/repack.gni") |
| 10 | 10 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 "user_window_controller_impl.h", | 71 "user_window_controller_impl.h", |
| 72 "window_manager.cc", | 72 "window_manager.cc", |
| 73 "window_manager.h", | 73 "window_manager.h", |
| 74 "window_manager_application.cc", | 74 "window_manager_application.cc", |
| 75 "window_manager_application.h", | 75 "window_manager_application.h", |
| 76 "window_manager_observer.h", | 76 "window_manager_observer.h", |
| 77 ] | 77 ] |
| 78 | 78 |
| 79 deps = [ | 79 deps = [ |
| 80 "//components/user_manager", | 80 "//components/user_manager", |
| 81 # JAMES: Should these be public deps? |
| 82 "//device/bluetooth", |
| 83 "//ui/message_center", |
| 81 ] | 84 ] |
| 82 | 85 |
| 83 public_deps = [ | 86 public_deps = [ |
| 84 "//ash", | 87 "//ash", |
| 88 #JAMES |
| 89 "//ash/resources", |
| 90 "//ash/strings", |
| 91 |
| 85 "//ash/mus/resources", | 92 "//ash/mus/resources", |
| 86 "//ash/public/interfaces", | 93 "//ash/public/interfaces", |
| 87 "//base", | 94 "//base", |
| 88 "//components/mus/common:mus_common", | 95 "//components/mus/common:mus_common", |
| 89 "//components/mus/public/cpp", | 96 "//components/mus/public/cpp", |
| 90 "//components/mus/public/interfaces", | 97 "//components/mus/public/interfaces", |
| 91 "//mash/session/public/interfaces", | 98 "//mash/session/public/interfaces", |
| 92 "//mojo/common:common_base", | 99 "//mojo/common:common_base", |
| 93 "//services/shell/public/cpp", | 100 "//services/shell/public/cpp", |
| 94 "//services/tracing/public/cpp", | 101 "//services/tracing/public/cpp", |
| 95 "//skia", | 102 "//skia", |
| 96 "//ui/aura", | 103 "//ui/aura", |
| 97 "//ui/display/mojo", | 104 "//ui/display/mojo", |
| 98 "//ui/events", | 105 "//ui/events", |
| 99 "//ui/gfx", | 106 "//ui/gfx", |
| 100 "//ui/gfx/geometry", | 107 "//ui/gfx/geometry", |
| 101 "//ui/gfx/geometry/mojo", | 108 "//ui/gfx/geometry/mojo", |
| 102 "//ui/resources", | 109 "//ui/resources", |
| 103 "//ui/strings", | 110 "//ui/strings", |
| 104 "//ui/views", | 111 "//ui/views", |
| 105 "//ui/views/mus:for_mojo_application", | 112 "//ui/views/mus:for_mojo_application", |
| 106 ] | 113 ] |
| 114 |
| 115 # JAMES |
| 116 if (is_chromeos) { |
| 117 deps += [ "//chromeos" ] |
| 118 } |
| 107 } | 119 } |
| 108 | 120 |
| 109 mojo_native_application("mus") { | 121 mojo_native_application("mus") { |
| 110 output_name = "ash" | 122 output_name = "ash" |
| 111 | 123 |
| 112 sources = [ | 124 sources = [ |
| 113 "main.cc", | 125 "main.cc", |
| 114 ] | 126 ] |
| 115 | 127 |
| 116 deps = [ | 128 deps = [ |
| (...skipping 12 matching lines...) Expand all Loading... |
| 129 resources = [ "$root_out_dir/ash_mus_resources.pak" ] | 141 resources = [ "$root_out_dir/ash_mus_resources.pak" ] |
| 130 } | 142 } |
| 131 | 143 |
| 132 mojo_application_manifest("manifest") { | 144 mojo_application_manifest("manifest") { |
| 133 application_name = "ash" | 145 application_name = "ash" |
| 134 source = "manifest.json" | 146 source = "manifest.json" |
| 135 } | 147 } |
| 136 | 148 |
| 137 repack("resources") { | 149 repack("resources") { |
| 138 sources = [ | 150 sources = [ |
| 151 #JAMES - how to do ash strings? |
| 152 "$root_out_dir/ash_test_strings.pak", |
| 153 |
| 139 "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak", | 154 "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak", |
| 140 "$root_gen_dir/ash/resources/ash_resources_100_percent.pak", | 155 "$root_gen_dir/ash/resources/ash_resources_100_percent.pak", |
| 141 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", | 156 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", |
| 142 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", | 157 # "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", |
| 143 "$root_gen_dir/ui/strings/ui_strings_en-US.pak", | 158 # "$root_gen_dir/ui/strings/ui_strings_en-US.pak", |
| 144 "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", | 159 "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", |
| 145 ] | 160 ] |
| 146 output = "$root_out_dir/ash_mus_resources.pak" | 161 output = "$root_out_dir/ash_mus_resources.pak" |
| 147 deps = [ | 162 deps = [ |
| 148 "//ash/mus/resources", | 163 "//ash/mus/resources", |
| 149 "//ash/resources", | 164 "//ash/resources", |
| 165 #JAMES |
| 166 "//ash/strings:ash_test_strings", |
| 167 |
| 150 "//ui/resources", | 168 "//ui/resources", |
| 151 "//ui/strings", | 169 "//ui/strings", |
| 152 "//ui/views/mus:resources", | 170 "//ui/views/mus:resources", |
| 153 "//ui/views/resources", | 171 "//ui/views/resources", |
| 154 ] | 172 ] |
| 155 } | 173 } |
| 156 | 174 |
| 157 source_set("unittests") { | 175 source_set("unittests") { |
| 158 testonly = true | 176 testonly = true |
| 159 | 177 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 "//ui/gfx/geometry", | 214 "//ui/gfx/geometry", |
| 197 "//ui/gfx/geometry/mojo", | 215 "//ui/gfx/geometry/mojo", |
| 198 "//ui/views/mus", | 216 "//ui/views/mus", |
| 199 ] | 217 ] |
| 200 | 218 |
| 201 data_deps = [ | 219 data_deps = [ |
| 202 ":mus", | 220 ":mus", |
| 203 "//mash/quick_launch", | 221 "//mash/quick_launch", |
| 204 ] | 222 ] |
| 205 } | 223 } |
| OLD | NEW |