Regression: Search+Key pops up app launcher

athena/input/accelerator_manager_impl.h

 // Copyright 2014 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 ATHENA_INPUT_ACCELERATOR_MANAGER_H_
 #define ATHENA_INPUT_ACCELERATOR_MANAGER_H_
 
 #include "athena/input/public/accelerator_manager.h"
 
 #include <map>
 
 #include "base/macros.h"
 #include "ui/base/accelerators/accelerator.h"
+#include "ui/base/accelerators/accelerator_history.h"
 #include "ui/events/event_target_iterator.h"
 
 namespace aura {
 class Window;
 }
 
 namespace wm {
 class AcceleratorFilter;
 class NestedAcceleratorController;
 }
@@ skipping 44 matching lines @@
   virtual void UnregisterAccelerator(const AcceleratorData& accelerator_data,
                                      AcceleratorHandler* handler) override;
   virtual void SetDebugAcceleratorsEnabled(bool enabled) override;
 
   // ui::AcceleratorTarget:
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
   virtual bool CanHandleAccelerators() const override;
 
   std::map<ui::Accelerator, InternalData> accelerators_;
   scoped_ptr<AcceleratorWrapper> accelerator_wrapper_;
+  scoped_ptr<ui::AcceleratorHistory> accelerator_history_;
   scoped_ptr<wm::AcceleratorFilter> accelerator_filter_;
   scoped_ptr<wm::NestedAcceleratorController> nested_accelerator_controller_;
   bool debug_accelerators_enabled_;
   bool global_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorManagerImpl);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_INPUT_ACCELERATOR_MANAGER_H_