Don't check ash accelerators in browser with mash.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 2012 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.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 1355 matching lines @@
       immersive_mode_controller_->GetRevealedLock(
           ImmersiveModeController::ANIMATE_REVEAL_NO));
 
   toolbar_->app_menu_button()->Activate(nullptr);
 }
 
 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 we don't want to hit, not all
accelerators.

+    return false;
+
   if ((event.type != blink::WebInputEvent::RawKeyDown) &&
       (event.type != blink::WebInputEvent::KeyUp)) {
     return false;
   }
 
   views::FocusManager* focus_manager = GetFocusManager();
   DCHECK(focus_manager);
 
   if (focus_manager->shortcut_handling_suspended())
     return false;
@@ skipping 1260 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }