Chromium Code Reviews| 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 fe8c83ef5cc8235e1cb3d251bbbdb321ce54450e..064a977017b3671d57c673ed38811ae8fca17714 100644 |
| --- a/chrome/browser/ui/views/frame/browser_view.cc |
| +++ b/chrome/browser/ui/views/frame/browser_view.cc |
| @@ -1373,6 +1373,10 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
| bool* is_keyboard_shortcut) { |
| *is_keyboard_shortcut = false; |
| + // When running in mash the browser should register accelerators with mus. |
| + if (chrome::IsRunningInMash()) |
|
sky
2016/04/20 20:26:49
This seems too early. It's only ash accelerators w
|
| + return false; |
| + |
| if ((event.type != blink::WebInputEvent::RawKeyDown) && |
| (event.type != blink::WebInputEvent::KeyUp)) { |
| return false; |