AURA/X11: Handle VKEY_MENU accelerator on content area

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c2a3d545ae35cb116f3594ed4b62f691957421e9..d51745cd5110773cee2651a1228da75b64817b61 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3480,9 +3480,6 @@
         'browser/ui/views/generic_info_view.h',
         'browser/ui/views/global_error_bubble_view.cc',
         'browser/ui/views/global_error_bubble_view.h',
-        'browser/ui/views/handle_web_keyboard_event_aura.cc',
-        'browser/ui/views/handle_web_keyboard_event_gtk.cc',
-        'browser/ui/views/handle_web_keyboard_event.h',
         'browser/ui/views/html_dialog_view.cc',
         'browser/ui/views/html_dialog_view.h',
         'browser/ui/views/hung_renderer_view.cc',
@@ -3654,6 +3651,9 @@
         'browser/ui/views/toolbar_view.h',
         'browser/ui/views/unhandled_keyboard_event_handler.cc',
         'browser/ui/views/unhandled_keyboard_event_handler.h',
+        'browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc',
+        'browser/ui/views/unhandled_keyboard_event_handler_gtk.cc',
+        'browser/ui/views/unhandled_keyboard_event_handler_win.cc',
         'browser/ui/views/uninstall_view.cc',
         'browser/ui/views/uninstall_view.h',
         'browser/ui/views/update_recommended_message_box.cc',
@@ -4911,8 +4911,9 @@
                 ['include', '^browser/ui/views/fullscreen_exit_bubble_views.h'],
                 ['include', '^browser/ui/views/global_error_bubble_view.cc'],
                 ['include', '^browser/ui/views/global_error_bubble_view.h'],
-                ['include', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'],
-                ['include', '^browser/ui/views/handle_web_keyboard_event.h'],
+                ['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
+                ['include', '^browser/ui/views/unhandled_keyboard_event_handler.h'],
+                ['include', '^browser/ui/views/unhandled_keyboard_event_handler_gtk.cc'],
                 ['include', '^browser/ui/views/html_dialog_view.cc'],
                 ['include', '^browser/ui/views/html_dialog_view.h'],
                 ['include', '^browser/ui/views/infobars/*'],
@@ -5014,8 +5015,6 @@
                 ['include', '^browser/ui/views/theme_background.h'],
                 ['include', '^browser/ui/views/toolbar_view.cc'],
                 ['include', '^browser/ui/views/toolbar_view.h'],
-                ['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
-                ['include', '^browser/ui/views/unhandled_keyboard_event_handler.h'],
                 ['include', '^browser/ui/views/update_recommended_message_box.cc'],
                 ['include', '^browser/ui/views/update_recommended_message_box.h'],
                 ['include', '^browser/ui/views/web_intent_picker_view.cc'],
@@ -5257,6 +5256,8 @@
             ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
             ['include', '^browser/ui/views/native_constrained_window_aura.cc'],
             ['include', '^browser/ui/views/stubs_aura.cc'],
+            ['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
+            ['include', '^browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc'],
           ],
         }],
         # Build Aura with ChromeOS.
@@ -5281,8 +5282,6 @@
             ['exclude', '^browser/chromeos/login/views_login_display_host.cc'],
             ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test.cc'],
             ['exclude', '^browser/chromeos/notifications/'],
-            ['include', '^browser/ui/views/handle_web_keyboard_event_aura.cc'],
-            ['include', '^browser/ui/views/handle_web_keyboard_event.h'],
           ],
         }],
         [ 'use_openssl==1', {