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

Side by Side Diff: ash/BUILD.gn

Issue 2361563002: chromeos: Laser tool blocks events from propagating. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « no previous file | ash/ash.gyp » ('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("//testing/test.gni") 7 import("//testing/test.gni")
8 import("//ui/base/ui_features.gni") 8 import("//ui/base/ui_features.gni")
9 9
10 assert(use_aura) 10 assert(use_aura)
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 "//third_party/qcms", 117 "//third_party/qcms",
118 "//ui/chromeos", 118 "//ui/chromeos",
119 "//ui/chromeos/resources", 119 "//ui/chromeos/resources",
120 "//ui/chromeos/strings", 120 "//ui/chromeos/strings",
121 "//ui/display/util", 121 "//ui/display/util",
122 ] 122 ]
123 123
124 data = [ 124 data = [
125 "display/test_data/", 125 "display/test_data/",
126 ] 126 ]
127
128 sources += [
129 "laser/laser_pointer_controller.cc",
130 "laser/laser_pointer_controller.h",
131 "laser/laser_pointer_points.cc",
132 "laser/laser_pointer_points.h",
133 "laser/laser_pointer_view.cc",
134 "laser/laser_pointer_view.h",
135 "magnifier/partial_magnification_controller.cc",
136 "magnifier/partial_magnification_controller.h",
137 ]
127 } else { 138 } else {
128 sources -= [ 139 sources -= [
129 "accelerators/key_hold_detector.cc", 140 "accelerators/key_hold_detector.cc",
130 "accelerators/key_hold_detector.h", 141 "accelerators/key_hold_detector.h",
131 "accelerators/magnifier_key_scroller.cc", 142 "accelerators/magnifier_key_scroller.cc",
132 "accelerators/magnifier_key_scroller.h", 143 "accelerators/magnifier_key_scroller.h",
133 "accelerators/spoken_feedback_toggler.cc", 144 "accelerators/spoken_feedback_toggler.cc",
134 "accelerators/spoken_feedback_toggler.h", 145 "accelerators/spoken_feedback_toggler.h",
135 "display/resolution_notification_controller.cc", 146 "display/resolution_notification_controller.cc",
136 "display/resolution_notification_controller.h", 147 "display/resolution_notification_controller.h",
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 242
232 if (use_x11) { 243 if (use_x11) {
233 deps += [ "//ui/gfx/x" ] 244 deps += [ "//ui/gfx/x" ]
234 } 245 }
235 246
236 if (is_chromeos) { 247 if (is_chromeos) {
237 deps += [ 248 deps += [
238 "//chromeos", 249 "//chromeos",
239 "//ui/display", 250 "//ui/display",
240 ] 251 ]
252
253 sources += [
254 "laser/laser_pointer_controller_test_api.cc",
255 "laser/laser_pointer_controller_test_api.h",
256 "laser/laser_pointer_points_test_api.cc",
257 "laser/laser_pointer_points_test_api.h",
258 ]
241 } 259 }
242 } 260 }
243 261
244 static_library("test_support_with_content") { 262 static_library("test_support_with_content") {
245 testonly = true 263 testonly = true
246 sources = gypi_values.ash_test_support_with_content_sources 264 sources = gypi_values.ash_test_support_with_content_sources
247 configs += [ "//build/config:precompiled_headers" ] 265 configs += [ "//build/config:precompiled_headers" ]
248 266
249 deps = [ 267 deps = [
250 ":ash_with_content", 268 ":ash_with_content",
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 # Talks to ChromeOS system services. 431 # Talks to ChromeOS system services.
414 "wm/lock_state_controller_unittest.cc", 432 "wm/lock_state_controller_unittest.cc",
415 433
416 # Maximize mode is only available on Chrome OS. 434 # Maximize mode is only available on Chrome OS.
417 "wm/maximize_mode/maximize_mode_controller_unittest.cc", 435 "wm/maximize_mode/maximize_mode_controller_unittest.cc",
418 "wm/maximize_mode/maximize_mode_window_manager_unittest.cc", 436 "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
419 437
420 # Can't resize on Windows Ash. http://crbug.com/165962 438 # Can't resize on Windows Ash. http://crbug.com/165962
421 "autoclick/autoclick_unittest.cc", 439 "autoclick/autoclick_unittest.cc",
422 "magnifier/magnification_controller_unittest.cc", 440 "magnifier/magnification_controller_unittest.cc",
423 "magnifier/partial_magnification_controller_unittest.cc",
424 "sticky_keys/sticky_keys_overlay_unittest.cc", 441 "sticky_keys/sticky_keys_overlay_unittest.cc",
425 "virtual_keyboard_controller_unittest.cc", 442 "virtual_keyboard_controller_unittest.cc",
426 "wm/workspace/workspace_window_resizer_unittest.cc", 443 "wm/workspace/workspace_window_resizer_unittest.cc",
427 ] 444 ]
428 } 445 }
429 446
430 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 447 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
431 448
432 if (!use_x11) { 449 if (!use_x11) {
433 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] 450 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ]
434 } 451 }
435 if (is_chromeos) { 452 if (is_chromeos) {
436 sources += [ "first_run/first_run_helper_unittest.cc" ] 453 sources += [
454 "first_run/first_run_helper_unittest.cc",
455 "laser/laser_pointer_controller_unittest.cc",
456 "magnifier/partial_magnification_controller_unittest.cc"
457 ]
437 deps += [ 458 deps += [
438 "//chromeos", 459 "//chromeos",
439 "//chromeos:power_manager_proto", 460 "//chromeos:power_manager_proto",
440 "//chromeos:test_support_without_gmock", 461 "//chromeos:test_support_without_gmock",
441 "//components/quirks", 462 "//components/quirks",
442 "//device/bluetooth", 463 "//device/bluetooth",
443 "//net:net", 464 "//net:net",
444 "//ui/chromeos", 465 "//ui/chromeos",
445 "//ui/display", 466 "//ui/display",
446 "//ui/display:test_support", 467 "//ui/display:test_support",
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 configs += [ "//build/config/win:windowed" ] 512 configs += [ "//build/config/win:windowed" ]
492 deps += [ "//sandbox" ] 513 deps += [ "//sandbox" ]
493 } 514 }
494 515
495 if (is_chromeos) { 516 if (is_chromeos) {
496 deps += [ "//device/bluetooth" ] 517 deps += [ "//device/bluetooth" ]
497 } 518 }
498 } 519 }
499 # When adding support for isolates, please have a look at run-time dependencies 520 # When adding support for isolates, please have a look at run-time dependencies
500 # in the ash_unittests_run target in ash.gyp. 521 # in the ash_unittests_run target in ash.gyp.
OLDNEW
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698