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

Side by Side Diff: ui/display/BUILD.gn

Issue 2520143002: Move touchscreen_util.cc/h from ash to ui. (Closed)
Patch Set: Created 4 years 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/touch/touchscreen_util_unittest.cc ('k') | ui/display/manager/DEPS » ('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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 component("display") { 8 component("display") {
9 sources = [ 9 sources = [
10 "android/screen_android.cc", 10 "android/screen_android.cc",
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 "manager/display_layout_builder.cc", 47 "manager/display_layout_builder.cc",
48 "manager/display_layout_builder.h", 48 "manager/display_layout_builder.h",
49 "manager/display_layout_store.cc", 49 "manager/display_layout_store.cc",
50 "manager/display_layout_store.h", 50 "manager/display_layout_store.h",
51 "manager/display_manager.cc", 51 "manager/display_manager.cc",
52 "manager/display_manager.h", 52 "manager/display_manager.h",
53 "manager/display_manager_utilities.cc", 53 "manager/display_manager_utilities.cc",
54 "manager/display_manager_utilities.h", 54 "manager/display_manager_utilities.h",
55 "manager/managed_display_info.cc", 55 "manager/managed_display_info.cc",
56 "manager/managed_display_info.h", 56 "manager/managed_display_info.h",
57 "manager/touchscreen_util.cc",
58 "manager/touchscreen_util.h",
57 "screen.cc", 59 "screen.cc",
58 "screen.h", 60 "screen.h",
59 "screen_aura.cc", 61 "screen_aura.cc",
60 "screen_base.cc", 62 "screen_base.cc",
61 "screen_base.h", 63 "screen_base.h",
62 "win/display_info.cc", 64 "win/display_info.cc",
63 "win/display_info.h", 65 "win/display_info.h",
64 "win/dpi.cc", 66 "win/dpi.cc",
65 "win/dpi.h", 67 "win/dpi.h",
66 "win/scaling_util.cc", 68 "win/scaling_util.cc",
67 "win/scaling_util.h", 69 "win/scaling_util.h",
68 "win/screen_win.cc", 70 "win/screen_win.cc",
69 "win/screen_win.h", 71 "win/screen_win.h",
70 "win/screen_win_display.cc", 72 "win/screen_win_display.cc",
71 "win/screen_win_display.h", 73 "win/screen_win_display.h",
72 ] 74 ]
73 75
74 defines = [ "DISPLAY_IMPLEMENTATION" ] 76 defines = [ "DISPLAY_IMPLEMENTATION" ]
75 77
76 public_deps = [ 78 public_deps = [
77 "//ui/display/types", 79 "//ui/display/types",
78 "//ui/gfx:gfx", 80 "//ui/gfx:gfx",
79 ] 81 ]
80 82
81 deps = [ 83 deps = [
82 "//base", 84 "//base",
83 "//third_party/re2", 85 "//third_party/re2",
84 "//ui/display/util", 86 "//ui/display/util",
87 "//ui/events/devices",
sadrul 2016/11/22 02:03:05 Interesting. This doesn't introduce a cyclic depen
kylechar 2016/11/22 13:32:36 Not after crrev.com/2519993002!
85 "//ui/gfx", 88 "//ui/gfx",
86 "//ui/gfx/geometry", 89 "//ui/gfx/geometry",
87 ] 90 ]
88 91
89 if (is_chromeos && use_x11) { 92 if (is_chromeos && use_x11) {
90 sources += [ 93 sources += [
91 "chromeos/x11/display_mode_x11.cc", 94 "chromeos/x11/display_mode_x11.cc",
92 "chromeos/x11/display_mode_x11.h", 95 "chromeos/x11/display_mode_x11.h",
93 "chromeos/x11/display_snapshot_x11.cc", 96 "chromeos/x11/display_snapshot_x11.cc",
94 "chromeos/x11/display_snapshot_x11.h", 97 "chromeos/x11/display_snapshot_x11.h",
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 "chromeos/x11/display_util_x11_unittest.cc", 195 "chromeos/x11/display_util_x11_unittest.cc",
193 "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc", 196 "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
194 "display_change_notifier_unittest.cc", 197 "display_change_notifier_unittest.cc",
195 "display_list_unittest.cc", 198 "display_list_unittest.cc",
196 "display_unittest.cc", 199 "display_unittest.cc",
197 "fake_display_snapshot_unittests.cc", 200 "fake_display_snapshot_unittests.cc",
198 "manager/display_layout_builder_unittest.cc", 201 "manager/display_layout_builder_unittest.cc",
199 "manager/display_layout_unittest.cc", 202 "manager/display_layout_unittest.cc",
200 "manager/display_manager_utilities_unittest.cc", 203 "manager/display_manager_utilities_unittest.cc",
201 "manager/managed_display_info_unittest.cc", 204 "manager/managed_display_info_unittest.cc",
205 "manager/touchscreen_util_unittest.cc",
202 "screen_unittest.cc", 206 "screen_unittest.cc",
203 "util/display_util_unittest.cc", 207 "util/display_util_unittest.cc",
204 "util/edid_parser_unittest.cc", 208 "util/edid_parser_unittest.cc",
205 "win/scaling_util_unittest.cc", 209 "win/scaling_util_unittest.cc",
206 "win/screen_win_unittest.cc", 210 "win/screen_win_unittest.cc",
207 ] 211 ]
208 212
209 deps = [ 213 deps = [
210 ":display", 214 ":display",
215 ":display_manager_test_api",
211 ":test_support", 216 ":test_support",
212 "//base", 217 "//base",
213 "//base/test:run_all_unittests", 218 "//base/test:run_all_unittests",
214 "//base/test:test_support", 219 "//base/test:test_support",
215 "//testing/gmock", 220 "//testing/gmock",
216 "//testing/gtest", 221 "//testing/gtest",
217 "//ui/display/types", 222 "//ui/display/types",
218 "//ui/display/util", 223 "//ui/display/util",
224 "//ui/events/devices",
219 "//ui/gfx:test_support", 225 "//ui/gfx:test_support",
220 "//ui/gfx/geometry", 226 "//ui/gfx/geometry",
221 ] 227 ]
222 228
223 if (is_android) { 229 if (is_android) {
224 # Do not run display_change_notifier_unittest.cc on Android because it 230 # Do not run display_change_notifier_unittest.cc on Android because it
225 # does not compile display_observer.cc 231 # does not compile display_observer.cc
226 sources -= [ "display_change_notifier_unittest.cc" ] 232 sources -= [ "display_change_notifier_unittest.cc" ]
227 } 233 }
228 234
229 if (is_chromeos && use_ozone) { 235 if (is_chromeos && use_ozone) {
230 sources -= [ 236 sources -= [
231 "chromeos/x11/display_util_x11_unittest.cc", 237 "chromeos/x11/display_util_x11_unittest.cc",
232 "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc", 238 "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
233 ] 239 ]
234 } 240 }
235 } 241 }
OLDNEW
« no previous file with comments | « ash/touch/touchscreen_util_unittest.cc ('k') | ui/display/manager/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698