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

Unified Diff: ui/events/events.gyp

Issue 235693002: Merge 260900 "linux_aura: Port GtkKeybindingsHandler to Aura." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/
Patch Set: Created 6 years, 8 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 | « content/public/browser/native_web_keyboard_event.h ('k') | ui/events/x/text_edit_command_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/events.gyp
===================================================================
--- ui/events/events.gyp (revision 263301)
+++ ui/events/events.gyp (working copy)
@@ -54,10 +54,10 @@
'keycodes/keyboard_codes.h',
'latency_info.cc',
'latency_info.h',
+ 'x/device_data_manager.cc',
+ 'x/device_data_manager.h',
'x/device_list_cache_x.cc',
'x/device_list_cache_x.h',
- 'x/device_data_manager.cc',
- 'x/device_data_manager.h',
'x/touch_factory_x11.cc',
'x/touch_factory_x11.h',
],
@@ -148,6 +148,10 @@
'platform/x11/x11_event_source.h',
'win/events_win.cc',
'x/events_x.cc',
+ 'x/text_edit_command_x11.cc',
+ 'x/text_edit_command_x11.h',
+ 'x/text_edit_key_bindings_delegate_x11.cc',
+ 'x/text_edit_key_bindings_delegate_x11.h',
],
'conditions': [
# We explicitly enumerate the platforms we _do_ provide native cracking
@@ -157,6 +161,14 @@
'events_stub.cc',
],
}],
+ ['chromeos==1', {
+ 'sources!': [
+ 'x/text_edit_command_x11.cc',
+ 'x/text_edit_command_x11.h',
+ 'x/text_edit_key_bindings_delegate_x11.cc',
+ 'x/text_edit_key_bindings_delegate_x11.h',
+ ],
+ }],
['use_x11==1', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:x11',
« no previous file with comments | « content/public/browser/native_web_keyboard_event.h ('k') | ui/events/x/text_edit_command_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698