Aura: Support non-global keyboard shortcuts.

chrome/chrome_browser.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'dependencies': [
@@ skipping 3230 matching lines @@
         'browser/ui/touch/tabs/touch_tab.h',
         'browser/ui/touch/tabs/touch_tab_strip.cc',
         'browser/ui/touch/tabs/touch_tab_strip.h',
         'browser/ui/touch/tabs/touch_tab_strip_controller.cc',
         'browser/ui/touch/tabs/touch_tab_strip_controller.h',
         'browser/ui/view_ids.h',
         'browser/ui/views/about_chrome_view.cc',
         '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',
         'browser/ui/views/accessible_pane_view.h',
         'browser/ui/views/app_menu_button_win.cc',
         'browser/ui/views/app_menu_button_win.h',
         'browser/ui/views/appcache_info_view.cc',
         'browser/ui/views/appcache_info_view.h',
         'browser/ui/views/aura/chrome_shell_delegate.cc',
         'browser/ui/views/aura/chrome_shell_delegate.h',
@@ skipping 1297 matching lines @@
             ['exclude', '^browser/extensions/extension_rlz_module'],
 
             # Exclude all of views.
             ['exclude', '^browser/ui/views/'],
 
             # Exclude try chrome dialog.
             ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
             ['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',
                 '../views/views.gyp:views_desktop_lib',
               ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
                 '<(INTERMEDIATE_DIR)/chrome',
               ],
               'sources/': [
@@ skipping 60 matching lines @@
                 ['include', '^browser/ui/gtk/ssl_client_certificate_selector.cc'],
                 ['include', '^browser/ui/gtk/task_manager_gtk.cc'],
                 ['include', '^browser/ui/gtk/task_manager_gtk.h'],
                 ['include', '^browser/ui/gtk/view_id_util.cc'],
                 ['include', '^browser/ui/gtk/view_id_util.h'],
                 ['include', '^browser/ui/login/login_prompt_ui.cc'],
                 ['include', '^browser/ui/tabs/dock_info.cc'],
                 ['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'],
                 ['include', '^browser/ui/views/accessible_pane_view.h'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_popup_contents_view.h'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_result_view.cc'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_result_view.h'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_result_view_model.h'],
                 ['include', '^browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc'],
@@ skipping 565 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }