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

Side by Side Diff: ash/BUILD.gn

Issue 2311393004: Laser tool blocks events from propagating. (Closed)
Patch Set: Nit. 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/aura/wm_shell_aura.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("//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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 "common/system/chromeos/palette/palette_utils.cc", 245 "common/system/chromeos/palette/palette_utils.cc",
246 "common/system/chromeos/palette/palette_utils.h", 246 "common/system/chromeos/palette/palette_utils.h",
247 "common/system/chromeos/palette/tools/capture_region_mode.cc", 247 "common/system/chromeos/palette/tools/capture_region_mode.cc",
248 "common/system/chromeos/palette/tools/capture_region_mode.h", 248 "common/system/chromeos/palette/tools/capture_region_mode.h",
249 "common/system/chromeos/palette/tools/capture_screen_action.cc", 249 "common/system/chromeos/palette/tools/capture_screen_action.cc",
250 "common/system/chromeos/palette/tools/capture_screen_action.h", 250 "common/system/chromeos/palette/tools/capture_screen_action.h",
251 "common/system/chromeos/palette/tools/create_note_action.cc", 251 "common/system/chromeos/palette/tools/create_note_action.cc",
252 "common/system/chromeos/palette/tools/create_note_action.h", 252 "common/system/chromeos/palette/tools/create_note_action.h",
253 "common/system/chromeos/palette/tools/laser_pointer_mode.cc", 253 "common/system/chromeos/palette/tools/laser_pointer_mode.cc",
254 "common/system/chromeos/palette/tools/laser_pointer_mode.h", 254 "common/system/chromeos/palette/tools/laser_pointer_mode.h",
255 "common/system/chromeos/palette/tools/laser_pointer_points.cc",
256 "common/system/chromeos/palette/tools/laser_pointer_points.h",
257 "common/system/chromeos/palette/tools/laser_pointer_view.cc",
258 "common/system/chromeos/palette/tools/laser_pointer_view.h",
259 "common/system/chromeos/palette/tools/magnifier_mode.cc", 255 "common/system/chromeos/palette/tools/magnifier_mode.cc",
260 "common/system/chromeos/palette/tools/magnifier_mode.h", 256 "common/system/chromeos/palette/tools/magnifier_mode.h",
261 "common/system/chromeos/power/battery_notification.cc", 257 "common/system/chromeos/power/battery_notification.cc",
262 "common/system/chromeos/power/battery_notification.h", 258 "common/system/chromeos/power/battery_notification.h",
263 "common/system/chromeos/power/dual_role_notification.cc", 259 "common/system/chromeos/power/dual_role_notification.cc",
264 "common/system/chromeos/power/dual_role_notification.h", 260 "common/system/chromeos/power/dual_role_notification.h",
265 "common/system/chromeos/power/power_status.cc", 261 "common/system/chromeos/power/power_status.cc",
266 "common/system/chromeos/power/power_status.h", 262 "common/system/chromeos/power/power_status.h",
267 "common/system/chromeos/power/power_status_view.cc", 263 "common/system/chromeos/power/power_status_view.cc",
268 "common/system/chromeos/power/power_status_view.h", 264 "common/system/chromeos/power/power_status_view.h",
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 "host/transformer_helper.cc", 637 "host/transformer_helper.cc",
642 "host/transformer_helper.h", 638 "host/transformer_helper.h",
643 "ime/input_method_event_handler.cc", 639 "ime/input_method_event_handler.cc",
644 "ime/input_method_event_handler.h", 640 "ime/input_method_event_handler.h",
645 "link_handler_model.cc", 641 "link_handler_model.cc",
646 "link_handler_model.h", 642 "link_handler_model.h",
647 "link_handler_model_factory.cc", 643 "link_handler_model_factory.cc",
648 "link_handler_model_factory.h", 644 "link_handler_model_factory.h",
649 "magnifier/magnification_controller.cc", 645 "magnifier/magnification_controller.cc",
650 "magnifier/magnification_controller.h", 646 "magnifier/magnification_controller.h",
651 "magnifier/partial_magnification_controller.cc",
652 "magnifier/partial_magnification_controller.h",
653 "metrics/desktop_task_switch_metric_recorder.cc", 647 "metrics/desktop_task_switch_metric_recorder.cc",
654 "metrics/desktop_task_switch_metric_recorder.h", 648 "metrics/desktop_task_switch_metric_recorder.h",
655 "metrics/task_switch_metrics_recorder.cc", 649 "metrics/task_switch_metrics_recorder.cc",
656 "metrics/task_switch_metrics_recorder.h", 650 "metrics/task_switch_metrics_recorder.h",
657 "metrics/task_switch_time_tracker.cc", 651 "metrics/task_switch_time_tracker.cc",
658 "metrics/task_switch_time_tracker.h", 652 "metrics/task_switch_time_tracker.h",
659 "metrics/user_metrics_recorder.cc", 653 "metrics/user_metrics_recorder.cc",
660 "metrics/user_metrics_recorder.h", 654 "metrics/user_metrics_recorder.h",
661 "root_window_controller.cc", 655 "root_window_controller.cc",
662 "root_window_controller.h", 656 "root_window_controller.h",
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 "//third_party/qcms", 912 "//third_party/qcms",
919 "//ui/chromeos", 913 "//ui/chromeos",
920 "//ui/chromeos/resources", 914 "//ui/chromeos/resources",
921 "//ui/chromeos/strings", 915 "//ui/chromeos/strings",
922 "//ui/display/util", 916 "//ui/display/util",
923 ] 917 ]
924 918
925 data = [ 919 data = [
926 "display/test_data/", 920 "display/test_data/",
927 ] 921 ]
922
923 sources += [
924 "laser/laser_pointer_controller.cc",
925 "laser/laser_pointer_controller.h",
926 "laser/laser_pointer_points.cc",
927 "laser/laser_pointer_points.h",
928 "laser/laser_pointer_view.cc",
929 "laser/laser_pointer_view.h",
930 "magnifier/partial_magnification_controller.cc",
931 "magnifier/partial_magnification_controller.h",
932 ]
928 } else { 933 } else {
929 sources -= [ 934 sources -= [
930 "accelerators/key_hold_detector.cc", 935 "accelerators/key_hold_detector.cc",
931 "accelerators/key_hold_detector.h", 936 "accelerators/key_hold_detector.h",
932 "accelerators/magnifier_key_scroller.cc", 937 "accelerators/magnifier_key_scroller.cc",
933 "accelerators/magnifier_key_scroller.h", 938 "accelerators/magnifier_key_scroller.h",
934 "accelerators/spoken_feedback_toggler.cc", 939 "accelerators/spoken_feedback_toggler.cc",
935 "accelerators/spoken_feedback_toggler.h", 940 "accelerators/spoken_feedback_toggler.h",
936 "display/resolution_notification_controller.cc", 941 "display/resolution_notification_controller.cc",
937 "display/resolution_notification_controller.h", 942 "display/resolution_notification_controller.h",
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 1123
1119 if (use_x11) { 1124 if (use_x11) {
1120 deps += [ "//ui/gfx/x" ] 1125 deps += [ "//ui/gfx/x" ]
1121 } 1126 }
1122 1127
1123 if (is_chromeos) { 1128 if (is_chromeos) {
1124 deps += [ 1129 deps += [
1125 "//chromeos", 1130 "//chromeos",
1126 "//ui/display", 1131 "//ui/display",
1127 ] 1132 ]
1133
1134 sources += [
1135 "laser/laser_pointer_controller_test_api.cc",
1136 "laser/laser_pointer_controller_test_api.h",
1137 "laser/laser_pointer_points_test_api.cc",
1138 "laser/laser_pointer_points_test_api.h",
1139 ]
1128 } 1140 }
1129 } 1141 }
1130 1142
1131 static_library("test_support_without_content") { 1143 static_library("test_support_without_content") {
1132 testonly = true 1144 testonly = true
1133 sources = [ 1145 sources = [
1134 "test/ash_test_environment_default.cc", 1146 "test/ash_test_environment_default.cc",
1135 ] 1147 ]
1136 1148
1137 public_deps = [ 1149 public_deps = [
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 "common/shelf/shelf_model_unittest.cc", 1377 "common/shelf/shelf_model_unittest.cc",
1366 "common/shelf/shelf_tooltip_manager_unittest.cc", 1378 "common/shelf/shelf_tooltip_manager_unittest.cc",
1367 "common/shelf/shelf_window_watcher_unittest.cc", 1379 "common/shelf/shelf_window_watcher_unittest.cc",
1368 "common/system/chromeos/brightness/tray_brightness_unittest.cc", 1380 "common/system/chromeos/brightness/tray_brightness_unittest.cc",
1369 "common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc", 1381 "common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc",
1370 "common/system/chromeos/media_security/multi_profile_media_tray_item_unittes t.cc", 1382 "common/system/chromeos/media_security/multi_profile_media_tray_item_unittes t.cc",
1371 "common/system/chromeos/palette/mock_palette_tool_delegate.cc", 1383 "common/system/chromeos/palette/mock_palette_tool_delegate.cc",
1372 "common/system/chromeos/palette/mock_palette_tool_delegate.h", 1384 "common/system/chromeos/palette/mock_palette_tool_delegate.h",
1373 "common/system/chromeos/palette/palette_tool_manager_unittest.cc", 1385 "common/system/chromeos/palette/palette_tool_manager_unittest.cc",
1374 "common/system/chromeos/palette/tools/create_note_unittest.cc", 1386 "common/system/chromeos/palette/tools/create_note_unittest.cc",
1375 "common/system/chromeos/palette/tools/laser_pointer_mode_test_api.cc",
1376 "common/system/chromeos/palette/tools/laser_pointer_mode_test_api.h",
1377 "common/system/chromeos/palette/tools/laser_pointer_points_test_api.cc",
1378 "common/system/chromeos/palette/tools/laser_pointer_points_test_api.h",
1379 "common/system/chromeos/palette/tools/laser_pointer_unittest.cc",
1380 "common/system/chromeos/palette/tools/screenshot_unittest.cc", 1387 "common/system/chromeos/palette/tools/screenshot_unittest.cc",
1381 "common/system/chromeos/power/power_status_unittest.cc", 1388 "common/system/chromeos/power/power_status_unittest.cc",
1382 "common/system/chromeos/power/power_status_view_unittest.cc", 1389 "common/system/chromeos/power/power_status_view_unittest.cc",
1383 "common/system/chromeos/power/tray_power_unittest.cc", 1390 "common/system/chromeos/power/tray_power_unittest.cc",
1384 "common/system/chromeos/screen_security/screen_tray_item_unittest.cc", 1391 "common/system/chromeos/screen_security/screen_tray_item_unittest.cc",
1385 "common/system/chromeos/session/logout_confirmation_controller_unittest.cc", 1392 "common/system/chromeos/session/logout_confirmation_controller_unittest.cc",
1386 "common/system/chromeos/session/tray_session_length_limit_unittest.cc", 1393 "common/system/chromeos/session/tray_session_length_limit_unittest.cc",
1387 "common/system/chromeos/supervised/tray_supervised_user_unittest.cc", 1394 "common/system/chromeos/supervised/tray_supervised_user_unittest.cc",
1388 "common/system/date/date_view_unittest.cc", 1395 "common/system/date/date_view_unittest.cc",
1389 "common/system/ime/tray_ime_chromeos_unittest.cc", 1396 "common/system/ime/tray_ime_chromeos_unittest.cc",
(...skipping 25 matching lines...) Expand all
1415 "display/screen_position_controller_unittest.cc", 1422 "display/screen_position_controller_unittest.cc",
1416 "display/unified_mouse_warp_controller_unittest.cc", 1423 "display/unified_mouse_warp_controller_unittest.cc",
1417 "display/window_tree_host_manager_unittest.cc", 1424 "display/window_tree_host_manager_unittest.cc",
1418 "drag_drop/drag_drop_controller_unittest.cc", 1425 "drag_drop/drag_drop_controller_unittest.cc",
1419 "drag_drop/drag_drop_tracker_unittest.cc", 1426 "drag_drop/drag_drop_tracker_unittest.cc",
1420 "extended_desktop_unittest.cc", 1427 "extended_desktop_unittest.cc",
1421 "focus_cycler_unittest.cc", 1428 "focus_cycler_unittest.cc",
1422 "frame/caption_buttons/frame_size_button_unittest.cc", 1429 "frame/caption_buttons/frame_size_button_unittest.cc",
1423 "host/ash_window_tree_host_x11_unittest.cc", 1430 "host/ash_window_tree_host_x11_unittest.cc",
1424 "magnifier/magnification_controller_unittest.cc", 1431 "magnifier/magnification_controller_unittest.cc",
1425 "magnifier/partial_magnification_controller_unittest.cc",
1426 "metrics/desktop_task_switch_metric_recorder_unittest.cc", 1432 "metrics/desktop_task_switch_metric_recorder_unittest.cc",
1427 "metrics/task_switch_metrics_recorder_unittest.cc", 1433 "metrics/task_switch_metrics_recorder_unittest.cc",
1428 "metrics/task_switch_time_tracker_unittest.cc", 1434 "metrics/task_switch_time_tracker_unittest.cc",
1429 "metrics/user_metrics_recorder_unittest.cc", 1435 "metrics/user_metrics_recorder_unittest.cc",
1430 "root_window_controller_unittest.cc", 1436 "root_window_controller_unittest.cc",
1431 "rotator/screen_rotation_animation_unittest.cc", 1437 "rotator/screen_rotation_animation_unittest.cc",
1432 "screen_util_unittest.cc", 1438 "screen_util_unittest.cc",
1433 "shelf/shelf_layout_manager_unittest.cc", 1439 "shelf/shelf_layout_manager_unittest.cc",
1434 "shelf/shelf_unittest.cc", 1440 "shelf/shelf_unittest.cc",
1435 "shelf/shelf_view_unittest.cc", 1441 "shelf/shelf_view_unittest.cc",
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 "//ash/common/strings:ash_test_strings", 1557 "//ash/common/strings:ash_test_strings",
1552 "//ash/resources:ash_test_resources_100_percent", 1558 "//ash/resources:ash_test_resources_100_percent",
1553 "//ash/resources:ash_test_resources_200_percent", 1559 "//ash/resources:ash_test_resources_200_percent",
1554 ] 1560 ]
1555 1561
1556 if (!use_x11) { 1562 if (!use_x11) {
1557 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] 1563 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ]
1558 } 1564 }
1559 1565
1560 if (is_chromeos) { 1566 if (is_chromeos) {
1561 sources += [ "first_run/first_run_helper_unittest.cc" ] 1567 sources += [
1568 "first_run/first_run_helper_unittest.cc",
1569 "laser/laser_pointer_controller_unittest.cc",
1570 "magnifier/partial_magnification_controller_unittest.cc",
1571 ]
1562 deps += [ 1572 deps += [
1563 "//chromeos", 1573 "//chromeos",
1564 "//chromeos:power_manager_proto", 1574 "//chromeos:power_manager_proto",
1565 "//chromeos:test_support_without_gmock", 1575 "//chromeos:test_support_without_gmock",
1566 "//components/quirks", 1576 "//components/quirks",
1567 "//device/bluetooth", 1577 "//device/bluetooth",
1568 "//net:net", 1578 "//net:net",
1569 "//ui/chromeos", 1579 "//ui/chromeos",
1570 "//ui/display", 1580 "//ui/display",
1571 "//ui/display:test_support", 1581 "//ui/display:test_support",
1572 "//ui/display:test_util", 1582 "//ui/display:test_util",
1573 ] 1583 ]
1574 } else { 1584 } else {
1575 sources -= [ 1585 sources -= [
1576 "accelerators/magnifier_key_scroller_unittest.cc", 1586 "accelerators/magnifier_key_scroller_unittest.cc",
1577 "accelerators/spoken_feedback_toggler_unittest.cc", 1587 "accelerators/spoken_feedback_toggler_unittest.cc",
1578 1588
1579 # Can't resize on Windows Ash. http://crbug.com/165962 1589 # Can't resize on Windows Ash. http://crbug.com/165962
1580 "autoclick/autoclick_unittest.cc", 1590 "autoclick/autoclick_unittest.cc",
1581 "display/resolution_notification_controller_unittest.cc", 1591 "display/resolution_notification_controller_unittest.cc",
1582 1592
1583 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 1593 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
1584 "focus_cycler_unittest.cc", 1594 "focus_cycler_unittest.cc",
1585 "magnifier/magnification_controller_unittest.cc", 1595 "magnifier/magnification_controller_unittest.cc",
1586 "magnifier/partial_magnification_controller_unittest.cc",
1587 "sticky_keys/sticky_keys_overlay_unittest.cc", 1596 "sticky_keys/sticky_keys_overlay_unittest.cc",
1588 "sticky_keys/sticky_keys_unittest.cc", 1597 "sticky_keys/sticky_keys_unittest.cc",
1589 "touch/touchscreen_util_unittest.cc", 1598 "touch/touchscreen_util_unittest.cc",
1590 "virtual_keyboard_controller_unittest.cc", 1599 "virtual_keyboard_controller_unittest.cc",
1591 1600
1592 # All tests for multiple displays: not supported on Windows Ash. 1601 # All tests for multiple displays: not supported on Windows Ash.
1593 "wm/drag_window_resizer_unittest.cc", 1602 "wm/drag_window_resizer_unittest.cc",
1594 1603
1595 # Talks to ChromeOS system services. 1604 # Talks to ChromeOS system services.
1596 "wm/lock_state_controller_unittest.cc", 1605 "wm/lock_state_controller_unittest.cc",
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
1635 if (is_win) { 1644 if (is_win) {
1636 configs -= [ "//build/config/win:console" ] 1645 configs -= [ "//build/config/win:console" ]
1637 configs += [ "//build/config/win:windowed" ] 1646 configs += [ "//build/config/win:windowed" ]
1638 deps += [ "//sandbox" ] 1647 deps += [ "//sandbox" ]
1639 } 1648 }
1640 1649
1641 if (is_chromeos) { 1650 if (is_chromeos) {
1642 deps += [ "//device/bluetooth" ] 1651 deps += [ "//device/bluetooth" ]
1643 } 1652 }
1644 } 1653 }
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698