Index: chrome/browser/ui/views/frame/browser_view.cc |
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
index 83c7cc90690bd9e71a68adff72c43be652a0082e..a5c5a7943bd1d2531a3f87432132a62a7f553d22 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.cc |
+++ b/chrome/browser/ui/views/frame/browser_view.cc |
@@ -1375,12 +1375,6 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
return false; |
} |
- views::FocusManager* focus_manager = GetFocusManager(); |
- DCHECK(focus_manager); |
- |
- if (focus_manager->shortcut_handling_suspended()) |
- return false; |
- |
ui::Accelerator accelerator = |
ui::GetAcceleratorFromNativeWebKeyboardEvent(event); |
@@ -1414,6 +1408,8 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
// If the |accelerator| is a non-browser shortcut (e.g. Ash shortcut), the |
// command execution cannot be blocked and true is returned. However, it is |
// okay as long as is_app() is false. See comments in this function. |
+ views::FocusManager* focus_manager = GetFocusManager(); |
+ DCHECK(focus_manager); |
const bool processed = focus_manager->ProcessAccelerator(accelerator); |
const int id = controller->GetLastBlockedCommand(nullptr); |
controller->SetBlockCommandExecution(original_block_command_state); |