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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 88964f053980d148cf55150507808aa05d0d79b1..ae4f8d98fc2d7e285883eed100cb9235f2174a05 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -252,10 +252,6 @@ component("ash") {
"common/system/chromeos/palette/tools/create_note_action.h",
"common/system/chromeos/palette/tools/laser_pointer_mode.cc",
"common/system/chromeos/palette/tools/laser_pointer_mode.h",
- "common/system/chromeos/palette/tools/laser_pointer_points.cc",
- "common/system/chromeos/palette/tools/laser_pointer_points.h",
- "common/system/chromeos/palette/tools/laser_pointer_view.cc",
- "common/system/chromeos/palette/tools/laser_pointer_view.h",
"common/system/chromeos/palette/tools/magnifier_mode.cc",
"common/system/chromeos/palette/tools/magnifier_mode.h",
"common/system/chromeos/power/battery_notification.cc",
@@ -648,8 +644,6 @@ component("ash") {
"link_handler_model_factory.h",
"magnifier/magnification_controller.cc",
"magnifier/magnification_controller.h",
- "magnifier/partial_magnification_controller.cc",
- "magnifier/partial_magnification_controller.h",
"metrics/desktop_task_switch_metric_recorder.cc",
"metrics/desktop_task_switch_metric_recorder.h",
"metrics/task_switch_metrics_recorder.cc",
@@ -925,6 +919,17 @@ component("ash") {
data = [
"display/test_data/",
]
+
+ sources += [
+ "laser/laser_pointer_controller.cc",
+ "laser/laser_pointer_controller.h",
+ "laser/laser_pointer_points.cc",
+ "laser/laser_pointer_points.h",
+ "laser/laser_pointer_view.cc",
+ "laser/laser_pointer_view.h",
+ "magnifier/partial_magnification_controller.cc",
+ "magnifier/partial_magnification_controller.h",
+ ]
} else {
sources -= [
"accelerators/key_hold_detector.cc",
@@ -1125,6 +1130,13 @@ static_library("test_support_common") {
"//chromeos",
"//ui/display",
]
+
+ sources += [
+ "laser/laser_pointer_controller_test_api.cc",
+ "laser/laser_pointer_controller_test_api.h",
+ "laser/laser_pointer_points_test_api.cc",
+ "laser/laser_pointer_points_test_api.h",
+ ]
}
}
@@ -1372,11 +1384,6 @@ test("ash_unittests") {
"common/system/chromeos/palette/mock_palette_tool_delegate.h",
"common/system/chromeos/palette/palette_tool_manager_unittest.cc",
"common/system/chromeos/palette/tools/create_note_unittest.cc",
- "common/system/chromeos/palette/tools/laser_pointer_mode_test_api.cc",
- "common/system/chromeos/palette/tools/laser_pointer_mode_test_api.h",
- "common/system/chromeos/palette/tools/laser_pointer_points_test_api.cc",
- "common/system/chromeos/palette/tools/laser_pointer_points_test_api.h",
- "common/system/chromeos/palette/tools/laser_pointer_unittest.cc",
"common/system/chromeos/palette/tools/screenshot_unittest.cc",
"common/system/chromeos/power/power_status_unittest.cc",
"common/system/chromeos/power/power_status_view_unittest.cc",
@@ -1422,7 +1429,6 @@ test("ash_unittests") {
"frame/caption_buttons/frame_size_button_unittest.cc",
"host/ash_window_tree_host_x11_unittest.cc",
"magnifier/magnification_controller_unittest.cc",
- "magnifier/partial_magnification_controller_unittest.cc",
"metrics/desktop_task_switch_metric_recorder_unittest.cc",
"metrics/task_switch_metrics_recorder_unittest.cc",
"metrics/task_switch_time_tracker_unittest.cc",
@@ -1558,7 +1564,11 @@ test("ash_unittests") {
}
if (is_chromeos) {
- sources += [ "first_run/first_run_helper_unittest.cc" ]
+ sources += [
+ "first_run/first_run_helper_unittest.cc",
+ "laser/laser_pointer_controller_unittest.cc",
+ "magnifier/partial_magnification_controller_unittest.cc",
+ ]
deps += [
"//chromeos",
"//chromeos:power_manager_proto",
@@ -1583,7 +1593,6 @@ test("ash_unittests") {
# TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
"focus_cycler_unittest.cc",
"magnifier/magnification_controller_unittest.cc",
- "magnifier/partial_magnification_controller_unittest.cc",
"sticky_keys/sticky_keys_overlay_unittest.cc",
"sticky_keys/sticky_keys_unittest.cc",
"touch/touchscreen_util_unittest.cc",
« 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