chrome/chrome_browser_ui.gypi - Issue 13044014: Make sure manifest specified shortcut for Extension Command can not override the built-in shortcuts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 13044014: Make sure manifest specified shortcut for Extension Command can not override the built-in shortcuts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix for ChromeOS (ash) Created 7 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

« chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc ('K') | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/test/data/extensions/api_test/keybinding/dont_overwrite_system/background.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser_ui.gypi

diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi

index ba0a3813b9fbfbf68e7eefb3dc61262f4b1e12c5..a81dff79c15be2d188008c9f4086fe4e6e0ceba0 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -66,6 +66,7 @@

'sources': [

# All .cc, .h, .m, and .mm files under browser/ui except for:

# * tests and mocks.

+ 'browser/ui/accelerator_utils.h',

'browser/ui/active_tab_tracker.cc',

'browser/ui/active_tab_tracker.h',

'browser/ui/alternate_error_tab_observer.cc',

@@ -324,6 +325,7 @@

'browser/ui/chrome_select_file_policy.h',

'browser/ui/chrome_style.cc',

'browser/ui/chrome_style.h',

+ 'browser/ui/cocoa/accelerator_utils_cocoa.mm',

'browser/ui/cocoa/about_ipc_controller.h',

'browser/ui/cocoa/about_ipc_controller.mm',

'browser/ui/cocoa/about_ipc_dialog.h',

@@ -907,6 +909,7 @@

'browser/ui/global_error/global_error_service.h',

'browser/ui/global_error/global_error_service_factory.cc',

'browser/ui/global_error/global_error_service_factory.h',

+ 'browser/ui/gtk/accelerator_utils_gtk.cc',

'browser/ui/gtk/accelerators_gtk.cc',

'browser/ui/gtk/accelerators_gtk.h',

'browser/ui/gtk/action_box_button_gtk.cc',

@@ -1348,8 +1351,8 @@

'browser/ui/sync/one_click_signin_infobar_delegate.h',

'browser/ui/sync/one_click_signin_sync_starter.cc',

'browser/ui/sync/one_click_signin_sync_starter.h',

- 'browser/ui/sync/profile_signin_confirmation_helper.cc',

- 'browser/ui/sync/profile_signin_confirmation_helper.h',

+ 'browser/ui/sync/profile_signin_confirmation_helper.cc',

+ 'browser/ui/sync/profile_signin_confirmation_helper.h',

'browser/ui/sync/signin_histogram.h',

'browser/ui/sync/tab_contents_synced_tab_delegate.cc',

'browser/ui/sync/tab_contents_synced_tab_delegate.h',

@@ -1424,6 +1427,8 @@

'browser/ui/unload_controller.h',

'browser/ui/user_data_dir_dialog.h',

'browser/ui/view_ids.h',

+ 'browser/ui/views/accelerator_utils_aura.cc',

+ 'browser/ui/views/accelerator_utils_views.cc',

'browser/ui/views/about_ipc_dialog.cc',

'browser/ui/views/about_ipc_dialog.h',

'browser/ui/views/accessibility/accessibility_event_router_views.cc',