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

Unified Diff: views/views.gyp

Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: File permissions and aura fix. Created 9 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
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index d86723599f011fa170a430e8bbe43fa3cb9e0938..a71cf9744f02037e5566cf36798987b8cf22d7e9 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -13,7 +13,6 @@
['include', '_(win)\\.cc$'],
['include', '/win/'],
['include', '/win_[^/]*\\.cc$'],
- ['exclude', 'touchui/touch_factory.cc'],
]}],
['touchui==0', {
'sources/': [
@@ -259,8 +258,6 @@
'events/event_gtk.cc',
'events/event_wayland.cc',
'events/event_win.cc',
- 'events/event_utils_win.cc',
- 'events/event_utils_win.h',
'events/event_x.cc',
'focus/accelerator_handler.h',
'focus/accelerator_handler_aura.cc',
@@ -331,8 +328,6 @@
'repeat_controller.h',
'touchui/gesture_manager.cc',
'touchui/gesture_manager.h',
- 'touchui/touch_factory.cc',
- 'touchui/touch_factory.h',
'touchui/touch_selection_controller.cc',
'touchui/touch_selection_controller.h',
'touchui/touch_selection_controller_impl.cc',
@@ -425,8 +420,6 @@
['exclude', '_(gtk|x)\\.cc$'],
['exclude', '/(gtk|x)_[^/]*\\.cc$'],
['exclude', 'focus/accelerator_handler_touch.cc'],
- ['exclude', 'touchui/touch_factory.cc'],
- ['exclude', 'touchui/touch_factory.h'],
['include', 'controls/menu/native_menu_linux.cc'],
['include', 'controls/menu/native_menu_linux.h'],
['include', 'drag_utils_gtk.cc'],
@@ -541,6 +534,11 @@
'<(DEPTH)/third_party/wtl/include',
],
}],
+ ['use_x11==0', {
+ 'sources!': [
+ 'events/event_x.cc',
+ ],
+ }],
],
},
{

Powered by Google App Engine
This is Rietveld 408576698