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

Side by Side Diff: ash/BUILD.gn

Issue 336863002: Moving input device hotplug event processing outside of ui/display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | ash/touch/touchscreen_util.h » ('J')
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 7
8 gypi_values = exec_script( 8 gypi_values = exec_script(
9 "//build/gypi_to_gn.py", 9 "//build/gypi_to_gn.py",
10 [ rebase_path("ash.gyp") ], 10 [ rebase_path("ash.gyp") ],
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 "system/tray/media_security/media_capture_observer.h", 100 "system/tray/media_security/media_capture_observer.h",
101 "system/tray/media_security/multi_profile_media_tray_item.cc", 101 "system/tray/media_security/multi_profile_media_tray_item.cc",
102 "system/tray/media_security/multi_profile_media_tray_item.h", 102 "system/tray/media_security/multi_profile_media_tray_item.h",
103 ] 103 ]
104 } 104 }
105 105
106 if (!use_x11 || !is_chromeos) { 106 if (!use_x11 || !is_chromeos) {
107 sources -= [ 107 sources -= [
108 "touch/touch_transformer_controller.cc", 108 "touch/touch_transformer_controller.cc",
109 "touch/touch_transformer_controller.h", 109 "touch/touch_transformer_controller.h",
110 "touch/touchscreen_util.cc",
111 "touch/touchscreen_util.h",
110 ] 112 ]
111 } 113 }
112 114
113 if (!use_ozone) { 115 if (!use_ozone) {
114 sources -= [ 116 sources -= [
115 "display/mouse_cursor_event_filter_ozone.cc", 117 "display/mouse_cursor_event_filter_ozone.cc",
116 ] 118 ]
117 } 119 }
118 120
119 if (!use_ozone) { 121 if (!use_ozone) {
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 "//ui/display", 320 "//ui/display",
319 "//ui/display:test_util", 321 "//ui/display:test_util",
320 "//ui/display/types", 322 "//ui/display/types",
321 #'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', TODO(GYP ) 323 #'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', TODO(GYP )
322 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP) 324 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP)
323 ] 325 ]
324 } else { 326 } else {
325 sources -= [ 327 sources -= [
326 "display/resolution_notification_controller_unittest.cc", 328 "display/resolution_notification_controller_unittest.cc",
327 "touch/touch_transformer_controller_unittest.cc", 329 "touch/touch_transformer_controller_unittest.cc",
330 "touch/touchscreen_util_unittest.cc",
328 ] 331 ]
329 } 332 }
330 333
331 # TODO(GYP) is this necessary? 334 # TODO(GYP) is this necessary?
332 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { 335 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
333 # ldflags = "-rdynamic" 336 # ldflags = "-rdynamic"
334 337
335 if (use_ozone) { 338 if (use_ozone) {
336 sources -= [ 339 sources -= [
337 "sticky_keys/sticky_keys_unittest.cc", # crbug.com/354035 340 "sticky_keys/sticky_keys_unittest.cc", # crbug.com/354035
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 "//testing/gtest", 382 "//testing/gtest",
380 "//ui/aaccessibility", 383 "//ui/aaccessibility",
381 ] 384 ]
382 385
383 if (is_chromeos) { 386 if (is_chromeos) {
384 deps += [ "//ui/display" ] 387 deps += [ "//ui/display" ]
385 } 388 }
386 } 389 }
387 390
388 } # if false 391 } # if false
OLDNEW
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | ash/touch/touchscreen_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698