Regression: Search+Key pops up app launcher

athena/input/accelerator_manager_impl.cc

 // 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.
 
 #include "athena/input/accelerator_manager_impl.h"
 
 #include "athena/input/public/input_manager.h"
 #include "athena/util/switches.h"
 #include "base/logging.h"
 #include "ui/aura/window.h"
@@ skipping 244 matching lines @@
     views::FocusManagerFactory::Install(new FocusManagerFactory(this));
 
   ui::EventTarget* toplevel = InputManager::Get()->GetTopmostEventTarget();
   nested_accelerator_controller_.reset(
       new wm::NestedAcceleratorController(new NestedAcceleratorDelegate(this)));
 
   scoped_ptr<wm::AcceleratorDelegate> accelerator_delegate(
       new AcceleratorDelegate(this));
 
   accelerator_filter_.reset(
-      new wm::AcceleratorFilter(accelerator_delegate.Pass()));
+      new wm::AcceleratorFilter(accelerator_delegate.Pass(),
+                                accelerator_history_.get()));
   toplevel->AddPreTargetHandler(accelerator_filter_.get());
 }
 
 void AcceleratorManagerImpl::OnRootWindowCreated(aura::Window* root_window) {
   aura::client::SetDispatcherClient(root_window,
                                     nested_accelerator_controller_.get());
 }
 
 bool AcceleratorManagerImpl::Process(const ui::Accelerator& accelerator) {
   return accelerator_wrapper_->Process(accelerator);
 }
 
 bool AcceleratorManagerImpl::IsRegistered(const ui::Accelerator& accelerator,
                                           int flags) const {
   std::map<ui::Accelerator, InternalData>::const_iterator iter =
       accelerators_.find(accelerator);
   if (iter == accelerators_.end())
     return false;
   DCHECK(accelerator_wrapper_->GetCurrentTarget(accelerator));
   return flags == AF_NONE || iter->second.flags() & flags;
 }
 
 AcceleratorManagerImpl::AcceleratorManagerImpl(
     AcceleratorWrapper* accelerator_wrapper,
     bool global)
     : accelerator_wrapper_(accelerator_wrapper),
+      accelerator_history_(new ui::AcceleratorHistory),
       debug_accelerators_enabled_(switches::IsDebugAcceleratorsEnabled()),
       global_(global) {
 }
 
 void AcceleratorManagerImpl::RegisterAccelerators(
     const AcceleratorData accelerators[],
     size_t num_accelerators,
     AcceleratorHandler* handler) {
   for (size_t i = 0; i < num_accelerators; ++i)
     RegisterAccelerator(accelerators[i], handler);
@@ skipping 55 matching lines @@
   return InputManager::Get()->GetAcceleratorManager();
 }
 
 // static
 scoped_ptr<AcceleratorManager> AcceleratorManager::CreateForFocusManager(
     views::FocusManager* focus_manager) {
   return AcceleratorManagerImpl::CreateForFocusManager(focus_manager).Pass();
 }
 
 }  // namespace athena