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

Side by Side Diff: chrome/browser/chromeos/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/test/test_shell_delegate.h ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//chrome/chrome_tests.gni") 7 import("//chrome/chrome_tests.gni")
8 import("//media/media_options.gni") 8 import("//media/media_options.gni")
9 import("//third_party/protobuf/proto_library.gni") 9 import("//third_party/protobuf/proto_library.gni")
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 "//components/strings", 81 "//components/strings",
82 "//components/variations", 82 "//components/variations",
83 "//content/public/browser", 83 "//content/public/browser",
84 "//content/public/common", 84 "//content/public/common",
85 "//crypto", 85 "//crypto",
86 "//dbus", 86 "//dbus",
87 "//device/bluetooth", 87 "//device/bluetooth",
88 "//device/hid", 88 "//device/hid",
89 "//media", 89 "//media",
90 "//media/mojo/interfaces", 90 "//media/mojo/interfaces",
91 "//mojo/common",
92 "//mojo/shell/public/cpp",
91 "//net", 93 "//net",
92 "//ppapi/proxy:ipc", # For PpapiMsg_LoadPlugin 94 "//ppapi/proxy:ipc", # For PpapiMsg_LoadPlugin
93 95
94 # TODO: care about enable_basic_printing and enable_print_preview. 96 # TODO: care about enable_basic_printing and enable_print_preview.
95 "//printing", 97 "//printing",
96 "//skia", 98 "//skia",
97 "//storage/browser", 99 "//storage/browser",
98 "//storage/common", 100 "//storage/common",
99 "//sync", 101 "//sync",
100 "//third_party/adobe/flash:flapper_version_h", 102 "//third_party/adobe/flash:flapper_version_h",
101 "//third_party/cacheinvalidation", 103 "//third_party/cacheinvalidation",
102 "//third_party/icu", 104 "//third_party/icu",
103 "//third_party/leveldatabase", 105 "//third_party/leveldatabase",
104 "//third_party/libjingle", 106 "//third_party/libjingle",
105 "//third_party/libusb", 107 "//third_party/libusb",
106 "//third_party/protobuf:protobuf_lite", 108 "//third_party/protobuf:protobuf_lite",
107 "//third_party/protobuf:protoc($host_toolchain)", 109 "//third_party/protobuf:protoc($host_toolchain)",
108 "//third_party/re2", 110 "//third_party/re2",
109 "//third_party/zlib", 111 "//third_party/zlib",
110 "//ui/app_list", 112 "//ui/app_list",
111 "//ui/aura", 113 "//ui/aura",
112 "//ui/base", 114 "//ui/base",
113 "//ui/chromeos:ui_chromeos", 115 "//ui/chromeos:ui_chromeos",
114 "//ui/compositor", 116 "//ui/compositor",
115 "//ui/display", 117 "//ui/display",
116 "//ui/events:dom_keycode_converter", 118 "//ui/events:dom_keycode_converter",
117 "//ui/events/devices", 119 "//ui/events/devices",
118 "//ui/events/platform", 120 "//ui/events/platform",
119 "//ui/file_manager", 121 "//ui/file_manager",
122 "//ui/keyboard:mojom",
120 "//ui/message_center", 123 "//ui/message_center",
121 "//ui/surface", 124 "//ui/surface",
122 "//ui/views", 125 "//ui/views",
123 "//ui/views/controls/webview", 126 "//ui/views/controls/webview",
124 "//ui/web_dialogs", 127 "//ui/web_dialogs",
125 "//url", 128 "//url",
126 "//v8", 129 "//v8",
127 ] 130 ]
128 131
129 defines = [] 132 defines = [ "MOJO_SHELL_CLIENT" ]
130 133
131 sources = rebase_path(gypi_values.browser_chromeos_sources, ".", "//chrome") + 134 sources = rebase_path(gypi_values.browser_chromeos_sources, ".", "//chrome") +
132 rebase_path(gypi_values.browser_chromeos_extension_sources, 135 rebase_path(gypi_values.browser_chromeos_extension_sources,
133 ".", 136 ".",
134 "//chrome") 137 "//chrome")
138 sources += [
139 "chrome_interface_factory.cc",
140 "chrome_interface_factory.h",
141 ]
135 if (use_x11) { 142 if (use_x11) {
136 configs += [ "//build/config/linux:x11" ] 143 configs += [ "//build/config/linux:x11" ]
137 deps += [ "//ui/events/devices" ] 144 deps += [ "//ui/events/devices" ]
138 sources -= [ 145 sources -= [
139 "system/input_device_settings_impl_ozone.cc", 146 "system/input_device_settings_impl_ozone.cc",
140 "system_logs/touch_log_source_ozone.cc", 147 "system_logs/touch_log_source_ozone.cc",
141 ] 148 ]
142 } else { 149 } else {
143 assert(use_ozone, "Either use_x11 or use_ozone has to be specified.") 150 assert(use_ozone, "Either use_x11 or use_ozone has to be specified.")
144 deps += [ "//ui/ozone" ] 151 deps += [ "//ui/ozone" ]
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 "policy/proto/install_attributes.proto", 208 "policy/proto/install_attributes.proto",
202 ] 209 ]
203 } 210 }
204 211
205 proto_library("attestation_proto") { 212 proto_library("attestation_proto") {
206 sources = [ 213 sources = [
207 "attestation/attestation_key_payload.proto", 214 "attestation/attestation_key_payload.proto",
208 "attestation/attestation_signed_data.proto", 215 "attestation/attestation_signed_data.proto",
209 ] 216 ]
210 } 217 }
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698