Aura: Support non-global keyboard shortcuts.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a3f81a2deac3ea63a560f775bb361b4c84f8e312..83dc843bc6b5433c1049182d14487d621418257c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3248,8 +3248,8 @@
         'browser/ui/views/about_chrome_view.h',
         'browser/ui/views/about_ipc_dialog.cc',
         'browser/ui/views/about_ipc_dialog.h',
-        'browser/ui/views/accelerator_table_linux.cc',
-        'browser/ui/views/accelerator_table_linux.h',
+        'browser/ui/views/accelerator_table.cc',
+        'browser/ui/views/accelerator_table.h',
         'browser/ui/views/accessibility_event_router_views.cc',
         'browser/ui/views/accessibility_event_router_views.h',
         'browser/ui/views/accessible_pane_view.cc',
@@ -4567,6 +4567,12 @@
             ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
           ],
           'conditions': [
+            ['OS=="linux" or use_aura==1',{
+              'sources/': [
+                ['include', '^browser/ui/views/accelerator_table.cc'],
+                ['include', '^browser/ui/views/accelerator_table.h'],
+              ]
+            }],
             ['OS=="linux" and toolkit_views==1',{
               'dependencies': [
                 '../views/views.gyp:views',
@@ -4647,8 +4653,6 @@
                 ['include', '^browser/ui/tabs/dock_info.h'],
                 ['include', '^browser/ui/views/about_chrome_view.cc'],
                 ['include', '^browser/ui/views/about_chrome_view.h'],
-                ['include', '^browser/ui/views/accelerator_table_linux.cc'],
-                ['include', '^browser/ui/views/accelerator_table_linux.h'],
                 ['include', '^browser/ui/views/accessibility_event_router_views.cc'],
                 ['include', '^browser/ui/views/accessibility_event_router_views.h'],
                 ['include', '^browser/ui/views/accessible_pane_view.cc'],