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

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

Issue 1684823004: Refactors keyboard related code so mash can use a keyboard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk Created 4 years, 10 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
« no previous file with comments | « ash/keyboard/keyboard_ui_observer.h ('k') | ash/mus/keyboard_ui_mus.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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/tools/bindings/mojom.gni") 7 import("//mojo/public/tools/bindings/mojom.gni")
8 import("//tools/grit/repack.gni") 8 import("//tools/grit/repack.gni")
9 9
10 source_set("lib") { 10 source_set("lib") {
11 sources = [ 11 sources = [
12 "keyboard_ui_mus.cc",
13 "keyboard_ui_mus.h",
12 "shelf_delegate_mus.cc", 14 "shelf_delegate_mus.cc",
13 "shelf_delegate_mus.h", 15 "shelf_delegate_mus.h",
14 "shell_delegate_mus.cc", 16 "shell_delegate_mus.cc",
15 "shell_delegate_mus.h", 17 "shell_delegate_mus.h",
16 "stub_context_factory.cc", 18 "stub_context_factory.cc",
17 "stub_context_factory.h", 19 "stub_context_factory.h",
18 "sysui_application.cc", 20 "sysui_application.cc",
19 "sysui_application.h", 21 "sysui_application.h",
20 ] 22 ]
21 23
22 deps = [ 24 deps = [
23 "//ash", 25 "//ash",
24 "//cc", 26 "//cc",
25 "//cc/surfaces", 27 "//cc/surfaces",
26 "//components/mus/common", 28 "//components/mus/common",
27 "//components/mus/public/cpp", 29 "//components/mus/public/cpp",
28 "//components/mus/public/interfaces", 30 "//components/mus/public/interfaces",
29 "//components/user_manager", 31 "//components/user_manager",
30 "//mash/wm/public/interfaces", 32 "//mash/wm/public/interfaces",
31 "//mojo/common:common_base", 33 "//mojo/common:common_base",
32 "//mojo/converters/geometry", 34 "//mojo/converters/geometry",
33 "//mojo/converters/input_events", 35 "//mojo/converters/input_events",
34 "//mojo/services/tracing/public/cpp", 36 "//mojo/services/tracing/public/cpp",
35 "//mojo/shell/public/cpp", 37 "//mojo/shell/public/cpp",
36 "//skia", 38 "//skia",
37 "//ui/aura", 39 "//ui/aura",
38 "//ui/events", 40 "//ui/events",
39 "//ui/gfx", 41 "//ui/gfx",
40 "//ui/gfx/geometry", 42 "//ui/gfx/geometry",
43 "//ui/keyboard:mojom",
41 "//ui/message_center", 44 "//ui/message_center",
42 "//ui/mojo/init", 45 "//ui/mojo/init",
43 "//ui/platform_window/stub", 46 "//ui/platform_window/stub",
44 "//ui/resources", 47 "//ui/resources",
45 "//ui/strings", 48 "//ui/strings",
46 "//ui/views", 49 "//ui/views",
47 "//ui/views/mus:for_mojo_application", 50 "//ui/views/mus:for_mojo_application",
48 ] 51 ]
49 52
50 if (is_chromeos) { 53 if (is_chromeos) {
51 deps += [ 54 deps += [
52 "//chromeos", 55 "//chromeos",
53 "//device/bluetooth", 56 "//device/bluetooth",
54 "//ui/events/devices", 57 "//ui/events/devices",
55 ] 58 ]
56 } 59 }
57 } 60 }
58 61
59 mojo_native_application("mus") { 62 mojo_native_application("mus") {
60 output_name = "ash_sysui" 63 output_name = "ash_sysui"
61 sources = [ 64 sources = [
62 "main.cc", 65 "main.cc",
63 ] 66 ]
64 deps = [ 67 deps = [
65 ":lib", 68 ":lib",
66 "//mojo/shell/public/cpp", 69 "//mojo/shell/public/cpp",
67 ] 70 ]
71
72 data_deps = [
73 "//components/mus",
74 ]
68 } 75 }
OLDNEW
« no previous file with comments | « ash/keyboard/keyboard_ui_observer.h ('k') | ash/mus/keyboard_ui_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698