Chromium Code Reviews| 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/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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 85 deps = [ | 85 deps = [ |
| 86 "//components/user_manager", | 86 "//components/user_manager", |
| 87 "//ui/app_list/presenter", | 87 "//ui/app_list/presenter", |
| 88 "//ui/message_center", | 88 "//ui/message_center", |
| 89 ] | 89 ] |
| 90 | 90 |
| 91 public_deps = [ | 91 public_deps = [ |
| 92 "//ash", | 92 "//ash", |
| 93 "//ash/public/interfaces", | 93 "//ash/public/interfaces", |
| 94 "//base", | 94 "//base", |
| 95 "//mash/public/interfaces", | |
| 95 "//mash/session/public/interfaces", | 96 "//mash/session/public/interfaces", |
| 96 "//mojo/common:common_base", | 97 "//mojo/common:common_base", |
| 97 "//services/shell/public/cpp", | 98 "//services/shell/public/cpp", |
| 98 "//services/tracing/public/cpp", | 99 "//services/tracing/public/cpp", |
| 99 "//services/ui/common:mus_common", | 100 "//services/ui/common:mus_common", |
| 100 "//services/ui/public/cpp", | 101 "//services/ui/public/cpp", |
| 101 "//services/ui/public/interfaces", | 102 "//services/ui/public/interfaces", |
| 102 "//skia", | 103 "//skia", |
| 103 "//ui/aura", | 104 "//ui/aura", |
| 104 "//ui/events", | 105 "//ui/events", |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 130 deps = [ | 131 deps = [ |
| 131 ":lib", | 132 ":lib", |
| 132 ":resources", | 133 ":resources", |
| 133 "//services/shell/public/cpp", | 134 "//services/shell/public/cpp", |
| 134 ] | 135 ] |
| 135 | 136 |
| 136 # TODO(beng): This target relies on //mash/session, but there is a cycle so we | 137 # TODO(beng): This target relies on //mash/session, but there is a cycle so we |
| 137 # can't state that dependency here. | 138 # can't state that dependency here. |
| 138 data_deps = [ | 139 data_deps = [ |
| 139 ":manifest", | 140 ":manifest", |
| 141 "//ash/touch_hud/mus:touch_hud", | |
|
sky
2016/09/02 18:42:21
Shouldn't it be "lib" that his this data_dep?
riajiang
2016/09/02 19:05:02
ash/mus is only going to connect to the touch_hud
sky
2016/09/02 19:16:14
It's the code in accelerator_conroller_delegat_mus
riajiang
2016/09/02 19:31:05
Yes sorry! I misunderstood your question. Moved it
| |
| 140 "//services/ui", | 142 "//services/ui", |
| 141 ] | 143 ] |
| 142 | 144 |
| 143 resources = [ "$root_out_dir/ash_mus_resources.pak" ] | 145 resources = [ "$root_out_dir/ash_mus_resources.pak" ] |
| 144 } | 146 } |
| 145 | 147 |
| 146 service_manifest("manifest") { | 148 service_manifest("manifest") { |
| 147 name = "ash" | 149 name = "ash" |
| 148 source = "manifest.json" | 150 source = "manifest.json" |
| 149 } | 151 } |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 "//ui/views/mus", | 227 "//ui/views/mus", |
| 226 ] | 228 ] |
| 227 | 229 |
| 228 data_deps = [ | 230 data_deps = [ |
| 229 ":mus", | 231 ":mus", |
| 230 "//mash/quick_launch", | 232 "//mash/quick_launch", |
| 231 ] | 233 ] |
| 232 | 234 |
| 233 defines = [ "NOTIMPLEMENTED_POLICY=5" ] | 235 defines = [ "NOTIMPLEMENTED_POLICY=5" ] |
| 234 } | 236 } |
| OLD | NEW |