Fix accelerator handling for in-menu buttons in the app menu.

ui/views/controls/button/custom_button.cc

 // Copyright (c) 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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 247 matching lines @@
     SetState(STATE_NORMAL);
   }
   if (!event->handled())
     Button::OnGestureEvent(event);
 }
 
 bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {
   // Should only handle accelerators when active. However, only top level
   // widgets can be active, so for child widgets check if they are focused
   // instead.
-  if ((IsChildWidget() && !FocusInChildWidget()) ||
-      (!IsChildWidget() && !GetWidget()->IsActive())) {
+  if (!ShouldHandleAcceleratorWhenInactive() &&
+      ((IsChildWidget() && !FocusInChildWidget()) ||
+       (!IsChildWidget() && !GetWidget()->IsActive()))) {
     return false;
   }
   SetState(STATE_NORMAL);
   // TODO(beng): remove once NotifyClick takes ui::Event.
   ui::MouseEvent synthetic_event(
       ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
   NotifyClick(synthetic_event);
   return true;
 }
@@ skipping 74 matching lines @@
   return event.type() == ui::ET_GESTURE_TAP_DOWN ||
          event.type() == ui::ET_GESTURE_TAP ||
          (event.IsMouseEvent() &&
              (triggerable_event_flags_ & event.flags()) != 0);
 }
 
 bool CustomButton::ShouldEnterPushedState(const ui::Event& event) {
   return IsTriggerableEvent(event);
 }
 
+bool CustomButton::ShouldHandleAcceleratorWhenInactive() {
+  return false;
+}
+
 bool CustomButton::ShouldEnterHoveredState() {
   if (!visible())
     return false;
 
   bool check_mouse_position = true;
 #if defined(USE_AURA)
   // If another window has capture, we shouldn't check the current mouse
   // position because the button won't receive any mouse events - so if the
   // mouse was hovered, the button would be stuck in a hovered state (since it
   // would never receive OnMouseExited).
@@ skipping 35 matching lines @@
   return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget();
 }
 
 bool CustomButton::FocusInChildWidget() const {
   return GetWidget() &&
          GetWidget()->GetRootView()->Contains(
              GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views