Merge 260900 "linux_aura: Port GtkKeybindingsHandler to Aura."

ui/events/events.gyp

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',