Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7002)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10514003: Config UI for Extension Commands (part 1). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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/resources/extensions/extension_commands_overlay.css ('K') | « chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc ('k') | chrome/browser/ui/webui/extensions/command_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc (revision 140271)
+++ chrome/browser/ui/views/frame/browser_view.cc (working copy)
@@ -1166,6 +1166,9 @@
views::FocusManager* focus_manager = GetFocusManager();
DCHECK(focus_manager);
+ if (focus_manager->shortcut_handling_suspended())
+ return false;
+
ui::Accelerator accelerator(
static_cast<ui::KeyboardCode>(event.windowsKeyCode),
content::GetModifiersFromNativeWebKeyboardEvent(event));
« chrome/browser/resources/extensions/extension_commands_overlay.css ('K') | « chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc ('k') | chrome/browser/ui/webui/extensions/command_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698