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

Unified Diff: ash/ash.gyp

Issue 280833002: Re-land "Issue 191223007: Move touch CTM from X into Chrome" (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: adding missing file again Created 6 years, 7 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 | « ash/DEPS ('k') | ash/display/display_change_observer_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 72e903ba401b4cdb3faa1c6171cd0808157b8cef..87b0fe07f91d6a69939df791b827a3d200fc9b24 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -519,6 +519,8 @@
'touch/touch_hud_projection.h',
'touch/touch_observer_hud.cc',
'touch/touch_observer_hud.h',
+ 'touch/touch_transformer_controller.cc',
+ 'touch/touch_transformer_controller.h',
'touch/touch_uma.cc',
'touch/touch_uma.h',
'volume_control_delegate.h',
@@ -700,6 +702,8 @@
['exclude', 'accelerators/magnifier_key_scroller.h'],
['exclude', 'accelerators/spoken_feedback_toggler.cc'],
['exclude', 'accelerators/spoken_feedback_toggler.h'],
+ ['exclude', 'touch/touch_transformer_controller.cc'],
+ ['exclude', 'touch/touch_transformer_controller.h'],
],
}, { # else: use_x11==1
'dependencies': [
@@ -725,6 +729,8 @@
['exclude', 'system/tray/media_security/media_capture_observer.h'],
['exclude', 'system/tray/media_security/multi_profile_media_tray_item.cc'],
['exclude', 'system/tray/media_security/multi_profile_media_tray_item.h'],
+ ['exclude', 'touch/touch_transformer_controller.cc'],
+ ['exclude', 'touch/touch_transformer_controller.h'],
],
}],
],
@@ -974,6 +980,7 @@
'test/ash_unittests.cc',
'tooltips/tooltip_controller_unittest.cc',
'touch/touch_observer_hud_unittest.cc',
+ 'touch/touch_transformer_controller_unittest.cc',
'wm/app_list_controller_unittest.cc',
'wm/ash_native_cursor_manager_unittest.cc',
'wm/dock/docked_window_layout_manager_unittest.cc',
@@ -1048,6 +1055,7 @@
'sources/': [
['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
+ ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
],
}],
['chromeos==1', {
@@ -1065,6 +1073,7 @@
}, { # else: chromeos!=1
'sources/': [
['exclude', 'display/resolution_notification_controller_unittest.cc'],
+ ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
],
}],
['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
« no previous file with comments | « ash/DEPS ('k') | ash/display/display_change_observer_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698