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

Side by Side Diff: ash/BUILD.gn

Issue 2311393004: Laser tool blocks events from propagating. (Closed)
Patch Set: Fixed patch set 2 errors. 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') | ash/common/palette_delegate.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 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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 "host/ash_window_tree_host_unified.h", 630 "host/ash_window_tree_host_unified.h",
635 "host/ash_window_tree_host_win.cc", 631 "host/ash_window_tree_host_win.cc",
636 "host/ash_window_tree_host_win.h", 632 "host/ash_window_tree_host_win.h",
637 "host/ash_window_tree_host_x11.cc", 633 "host/ash_window_tree_host_x11.cc",
638 "host/ash_window_tree_host_x11.h", 634 "host/ash_window_tree_host_x11.h",
639 "host/root_window_transformer.h", 635 "host/root_window_transformer.h",
640 "host/transformer_helper.cc", 636 "host/transformer_helper.cc",
641 "host/transformer_helper.h", 637 "host/transformer_helper.h",
642 "ime/input_method_event_handler.cc", 638 "ime/input_method_event_handler.cc",
643 "ime/input_method_event_handler.h", 639 "ime/input_method_event_handler.h",
640 "laser/laser_pointer_controller.cc",
James Cook 2016/09/14 22:53:38 These may have to go in a special if (is_chromeos)
sammiequon 2016/09/16 17:35:26 Done.
641 "laser/laser_pointer_controller.h",
642 "laser/laser_pointer_points.cc",
643 "laser/laser_pointer_points.h",
644 "laser/laser_pointer_view.cc",
645 "laser/laser_pointer_view.h",
644 "link_handler_model.cc", 646 "link_handler_model.cc",
645 "link_handler_model.h", 647 "link_handler_model.h",
646 "link_handler_model_factory.cc", 648 "link_handler_model_factory.cc",
647 "link_handler_model_factory.h", 649 "link_handler_model_factory.h",
648 "magnifier/magnification_controller.cc", 650 "magnifier/magnification_controller.cc",
649 "magnifier/magnification_controller.h", 651 "magnifier/magnification_controller.h",
650 "magnifier/partial_magnification_controller.cc", 652 "magnifier/partial_magnification_controller.cc",
651 "magnifier/partial_magnification_controller.h", 653 "magnifier/partial_magnification_controller.h",
652 "metrics/desktop_task_switch_metric_recorder.cc", 654 "metrics/desktop_task_switch_metric_recorder.cc",
653 "metrics/desktop_task_switch_metric_recorder.h", 655 "metrics/desktop_task_switch_metric_recorder.h",
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 "//ui/ozone", 906 "//ui/ozone",
905 ] 907 ]
906 } else { 908 } else {
907 sources -= [ 909 sources -= [
908 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", 910 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
909 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", 911 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
910 ] 912 ]
911 } 913 }
912 914
913 if (is_chromeos) { 915 if (is_chromeos) {
914 deps += [ 916 deps += [
James Cook 2016/09/14 22:53:37 sources += [ ...the laser stuff... ] could go here
sammiequon 2016/09/16 17:35:26 Done.
915 "//chromeos", 917 "//chromeos",
916 "//chromeos:power_manager_proto", 918 "//chromeos:power_manager_proto",
917 "//components/quirks", 919 "//components/quirks",
918 "//device/bluetooth", 920 "//device/bluetooth",
919 921
920 # TODO(msw): Remove this; only ash_with_content should depend on webkit. 922 # TODO(msw): Remove this; only ash_with_content should depend on webkit.
921 "//third_party/WebKit/public:blink_headers", 923 "//third_party/WebKit/public:blink_headers",
922 "//third_party/qcms", 924 "//third_party/qcms",
923 "//ui/chromeos", 925 "//ui/chromeos",
924 "//ui/chromeos/resources", 926 "//ui/chromeos/resources",
925 "//ui/chromeos/strings", 927 "//ui/chromeos/strings",
926 "//ui/display/util", 928 "//ui/display/util",
927 ] 929 ]
928 930
929 data = [ 931 data = [
930 "display/test_data/", 932 "display/test_data/",
931 ] 933 ]
932 } else { 934 } else {
933 sources -= [ 935 sources -= [
934 "accelerators/key_hold_detector.cc", 936 "accelerators/key_hold_detector.cc",
James Cook 2016/09/14 22:53:38 Ideally all these things would go in the sources +
sammiequon 2016/09/16 17:35:26 Who should I file this bug for?
James Cook 2016/09/16 18:13:31 Doesn't matter who.
935 "accelerators/key_hold_detector.h", 937 "accelerators/key_hold_detector.h",
936 "accelerators/magnifier_key_scroller.cc", 938 "accelerators/magnifier_key_scroller.cc",
937 "accelerators/magnifier_key_scroller.h", 939 "accelerators/magnifier_key_scroller.h",
938 "accelerators/spoken_feedback_toggler.cc", 940 "accelerators/spoken_feedback_toggler.cc",
939 "accelerators/spoken_feedback_toggler.h", 941 "accelerators/spoken_feedback_toggler.h",
942 "common/system/chromeos/palette/palette_utils.cc",
943 "common/system/chromeos/palette/palette_utils.h",
940 "display/resolution_notification_controller.cc", 944 "display/resolution_notification_controller.cc",
941 "display/resolution_notification_controller.h", 945 "display/resolution_notification_controller.h",
942 "touch/touch_transformer_controller.cc", 946 "touch/touch_transformer_controller.cc",
943 "touch/touch_transformer_controller.h", 947 "touch/touch_transformer_controller.h",
944 "touch/touchscreen_util.cc", 948 "touch/touchscreen_util.cc",
945 "touch/touchscreen_util.h", 949 "touch/touchscreen_util.h",
946 "virtual_keyboard_controller.cc", 950 "virtual_keyboard_controller.cc",
947 "virtual_keyboard_controller.h", 951 "virtual_keyboard_controller.h",
948 "wm/stylus_metrics_recorder.cc", 952 "wm/stylus_metrics_recorder.cc",
949 "wm/stylus_metrics_recorder.h", 953 "wm/stylus_metrics_recorder.h",
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 static_library("test_support_common") { 1009 static_library("test_support_common") {
1006 testonly = true 1010 testonly = true
1007 visibility = [ ":*" ] 1011 visibility = [ ":*" ]
1008 sources = [ 1012 sources = [
1009 "common/test/material_design_controller_test_api.cc", 1013 "common/test/material_design_controller_test_api.cc",
1010 "common/test/material_design_controller_test_api.h", 1014 "common/test/material_design_controller_test_api.h",
1011 "common/test/test_palette_delegate.cc", 1015 "common/test/test_palette_delegate.cc",
1012 "common/test/test_palette_delegate.h", 1016 "common/test/test_palette_delegate.h",
1013 "common/test/test_volume_control_delegate.cc", 1017 "common/test/test_volume_control_delegate.cc",
1014 "common/test/test_volume_control_delegate.h", 1018 "common/test/test_volume_control_delegate.h",
1019 "laser/laser_pointer_controller_test_api.cc",
1020 "laser/laser_pointer_controller_test_api.h",
1021 "laser/laser_pointer_points_test_api.cc",
1022 "laser/laser_pointer_points_test_api.h",
1015 "shell/toplevel_window.cc", 1023 "shell/toplevel_window.cc",
1016 "shell/toplevel_window.h", 1024 "shell/toplevel_window.h",
1017 "test/ash_md_test_base.cc", 1025 "test/ash_md_test_base.cc",
1018 "test/ash_md_test_base.h", 1026 "test/ash_md_test_base.h",
1019 "test/ash_test_base.cc", 1027 "test/ash_test_base.cc",
1020 "test/ash_test_base.h", 1028 "test/ash_test_base.h",
1021 "test/ash_test_environment.h", 1029 "test/ash_test_environment.h",
1022 "test/ash_test_helper.cc", 1030 "test/ash_test_helper.cc",
1023 "test/ash_test_helper.h", 1031 "test/ash_test_helper.h",
1024 "test/ash_test_views_delegate.cc", 1032 "test/ash_test_views_delegate.cc",
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 "common/shelf/shelf_model_unittest.cc", 1377 "common/shelf/shelf_model_unittest.cc",
1370 "common/shelf/shelf_tooltip_manager_unittest.cc", 1378 "common/shelf/shelf_tooltip_manager_unittest.cc",
1371 "common/shelf/shelf_window_watcher_unittest.cc", 1379 "common/shelf/shelf_window_watcher_unittest.cc",
1372 "common/system/chromeos/brightness/tray_brightness_unittest.cc", 1380 "common/system/chromeos/brightness/tray_brightness_unittest.cc",
1373 "common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc", 1381 "common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc",
1374 "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",
1375 "common/system/chromeos/palette/mock_palette_tool_delegate.cc", 1383 "common/system/chromeos/palette/mock_palette_tool_delegate.cc",
1376 "common/system/chromeos/palette/mock_palette_tool_delegate.h", 1384 "common/system/chromeos/palette/mock_palette_tool_delegate.h",
1377 "common/system/chromeos/palette/palette_tool_manager_unittest.cc", 1385 "common/system/chromeos/palette/palette_tool_manager_unittest.cc",
1378 "common/system/chromeos/palette/tools/create_note_unittest.cc", 1386 "common/system/chromeos/palette/tools/create_note_unittest.cc",
1379 "common/system/chromeos/palette/tools/laser_pointer_mode_test_api.cc",
1380 "common/system/chromeos/palette/tools/laser_pointer_mode_test_api.h",
1381 "common/system/chromeos/palette/tools/laser_pointer_points_test_api.cc",
1382 "common/system/chromeos/palette/tools/laser_pointer_points_test_api.h",
1383 "common/system/chromeos/palette/tools/laser_pointer_unittest.cc",
1384 "common/system/chromeos/palette/tools/screenshot_unittest.cc", 1387 "common/system/chromeos/palette/tools/screenshot_unittest.cc",
1385 "common/system/chromeos/power/power_status_unittest.cc", 1388 "common/system/chromeos/power/power_status_unittest.cc",
1386 "common/system/chromeos/power/power_status_view_unittest.cc", 1389 "common/system/chromeos/power/power_status_view_unittest.cc",
1387 "common/system/chromeos/power/tray_power_unittest.cc", 1390 "common/system/chromeos/power/tray_power_unittest.cc",
1388 "common/system/chromeos/screen_security/screen_tray_item_unittest.cc", 1391 "common/system/chromeos/screen_security/screen_tray_item_unittest.cc",
1389 "common/system/chromeos/session/logout_confirmation_controller_unittest.cc", 1392 "common/system/chromeos/session/logout_confirmation_controller_unittest.cc",
1390 "common/system/chromeos/session/tray_session_length_limit_unittest.cc", 1393 "common/system/chromeos/session/tray_session_length_limit_unittest.cc",
1391 "common/system/chromeos/supervised/tray_supervised_user_unittest.cc", 1394 "common/system/chromeos/supervised/tray_supervised_user_unittest.cc",
1392 "common/system/date/date_view_unittest.cc", 1395 "common/system/date/date_view_unittest.cc",
1393 "common/system/ime/tray_ime_chromeos_unittest.cc", 1396 "common/system/ime/tray_ime_chromeos_unittest.cc",
(...skipping 24 matching lines...) Expand all
1418 "display/screen_ash_unittest.cc", 1421 "display/screen_ash_unittest.cc",
1419 "display/screen_position_controller_unittest.cc", 1422 "display/screen_position_controller_unittest.cc",
1420 "display/unified_mouse_warp_controller_unittest.cc", 1423 "display/unified_mouse_warp_controller_unittest.cc",
1421 "display/window_tree_host_manager_unittest.cc", 1424 "display/window_tree_host_manager_unittest.cc",
1422 "drag_drop/drag_drop_controller_unittest.cc", 1425 "drag_drop/drag_drop_controller_unittest.cc",
1423 "drag_drop/drag_drop_tracker_unittest.cc", 1426 "drag_drop/drag_drop_tracker_unittest.cc",
1424 "extended_desktop_unittest.cc", 1427 "extended_desktop_unittest.cc",
1425 "focus_cycler_unittest.cc", 1428 "focus_cycler_unittest.cc",
1426 "frame/caption_buttons/frame_size_button_unittest.cc", 1429 "frame/caption_buttons/frame_size_button_unittest.cc",
1427 "host/ash_window_tree_host_x11_unittest.cc", 1430 "host/ash_window_tree_host_x11_unittest.cc",
1431 "laser/laser_pointer_controller_unittest.cc",
1428 "magnifier/magnification_controller_unittest.cc", 1432 "magnifier/magnification_controller_unittest.cc",
1429 "magnifier/partial_magnification_controller_unittest.cc", 1433 "magnifier/partial_magnification_controller_unittest.cc",
1430 "metrics/desktop_task_switch_metric_recorder_unittest.cc", 1434 "metrics/desktop_task_switch_metric_recorder_unittest.cc",
1431 "metrics/task_switch_metrics_recorder_unittest.cc", 1435 "metrics/task_switch_metrics_recorder_unittest.cc",
1432 "metrics/task_switch_time_tracker_unittest.cc", 1436 "metrics/task_switch_time_tracker_unittest.cc",
1433 "metrics/user_metrics_recorder_unittest.cc", 1437 "metrics/user_metrics_recorder_unittest.cc",
1434 "root_window_controller_unittest.cc", 1438 "root_window_controller_unittest.cc",
1435 "rotator/screen_rotation_animation_unittest.cc", 1439 "rotator/screen_rotation_animation_unittest.cc",
1436 "screen_util_unittest.cc", 1440 "screen_util_unittest.cc",
1437 "shelf/shelf_layout_manager_unittest.cc", 1441 "shelf/shelf_layout_manager_unittest.cc",
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 if (is_win) { 1643 if (is_win) {
1640 configs -= [ "//build/config/win:console" ] 1644 configs -= [ "//build/config/win:console" ]
1641 configs += [ "//build/config/win:windowed" ] 1645 configs += [ "//build/config/win:windowed" ]
1642 deps += [ "//sandbox" ] 1646 deps += [ "//sandbox" ]
1643 } 1647 }
1644 1648
1645 if (is_chromeos) { 1649 if (is_chromeos) {
1646 deps += [ "//device/bluetooth" ] 1650 deps += [ "//device/bluetooth" ]
1647 } 1651 }
1648 } 1652 }
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | ash/common/palette_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698