Fixes issue with accelerators when a menu is open

ash/accelerators/accelerator_controller.h

 // 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.
 
 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 #pragma once
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ash/ash_export.h"
+#include "ui/aura/client/accelerator_client.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace ui {
 class AcceleratorManager;
 }
 
 namespace ash {
 
 class ScreenshotDelegate;
 class CapsLockDelegate;
 
 // AcceleratorController provides functions for registering or unregistering
 // global keyboard accelerators, which are handled earlier than any windows. It
 // also implements several handlers as an accelerator target.
-class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
+class ASH_EXPORT AcceleratorController : public aura::client::AcceleratorClient,
+                                         public ui::AcceleratorTarget {
  public:
   AcceleratorController();
   virtual ~AcceleratorController();
 
   // Register a global keyboard accelerator for the specified target. If
   // multiple targets are registered for an accelerator, a target registered
   // later has higher priority.
   void Register(const ui::Accelerator& accelerator,
                 ui::AcceleratorTarget* target);
 
@@ skipping 32 matching lines @@
   // A map from accelerators to the AcceleratorAction values, which are used in
   // the implementation.
   std::map<ui::Accelerator, int> accelerators_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_