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

Unified Diff: ui/ui.gyp

Issue 24482004: events: Make platform specific events code into ui/events/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 | « ui/gfx/x/x11_atom_cache.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 316617adce39756070a18cca084f7244a3e77567..137b5f0d2d92161d8243f8722accddc93dc56468 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -297,7 +297,7 @@
'base/win/accessibility_misc_utils.cc',
'base/win/accessibility_misc_utils.h',
'base/win/atl_module.h',
- 'base/win/events_win.cc',
+ 'events/win/events_win.cc',
'base/win/extra_sdk_defines.h',
'base/win/foreground_helper.cc',
'base/win/foreground_helper.h',
@@ -321,11 +321,13 @@
'base/x/active_window_watcher_x.cc',
'base/x/active_window_watcher_x.h',
'base/x/active_window_watcher_x_observer.h',
- 'base/x/device_data_manager.cc',
- 'base/x/device_data_manager.h',
- 'base/x/device_list_cache_x.cc',
- 'base/x/device_list_cache_x.h',
- 'base/x/events_x.cc',
+ 'events/x/device_data_manager.cc',
+ 'events/x/device_data_manager.h',
+ 'events/x/device_list_cache_x.cc',
+ 'events/x/device_list_cache_x.h',
+ 'events/x/events_x.cc',
+ 'events/x/events_x_utils.cc',
+ 'events/x/events_x_utils.h',
'base/x/root_window_property_watcher_x.cc',
'base/x/root_window_property_watcher_x.h',
'base/x/selection_owner.cc',
@@ -336,8 +338,6 @@
'base/x/selection_utils.h',
'base/x/work_area_watcher_x.cc',
'base/x/work_area_watcher_x.h',
- 'base/x/x11_atom_cache.cc',
- 'base/x/x11_atom_cache.h',
'base/x/x11_error_tracker.cc',
'base/x/x11_error_tracker.h',
'base/x/x11_error_tracker_gtk.cc',
@@ -609,6 +609,8 @@
'gfx/win/singleton_hwnd.h',
'gfx/win/window_impl.cc',
'gfx/win/window_impl.h',
+ 'gfx/x/x11_atom_cache.cc',
+ 'gfx/x/x11_atom_cache.h',
'gfx/x/x11_types.cc',
'gfx/x/x11_types.h',
'webui/jstemplate_builder.cc',
@@ -879,6 +881,7 @@
'sources/': [
['exclude', 'events/keycodes/keyboard_code_conversion_x.*'],
['exclude', 'base/x/*'],
+ ['exclude', 'events/x/*'],
],
}],
['use_ozone==0', {
@@ -890,7 +893,6 @@
}],
['toolkit_views==0', {
'sources!': [
- 'base/x/events_x.cc',
'base/dragdrop/drop_target_event.cc',
'base/dragdrop/drop_target_event.h',
'events/event.cc',
@@ -901,6 +903,7 @@
'events/event_handler.h',
'events/event_target.cc',
'events/event_target.h',
+ 'events/x/events_x.cc',
],
}],
['OS=="android"', {
« no previous file with comments | « ui/gfx/x/x11_atom_cache.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698