Regression: Search+Key pops up app launcher

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index f8e6aab42c74b8832e0de6d10f008c2a2dc29d96..9d7a65ab56a7a0ceafc9e25eb01dbb7aec5ff373 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -899,9 +899,12 @@ void Shell::Init(const ShellInitParams& init_params) {
 
   cursor_manager_.SetDisplay(GetScreen()->GetPrimaryDisplay());
 
+  accelerator_history_.reset(new ui::AcceleratorHistory());
+
   nested_accelerator_controller_.reset(
       new ::wm::NestedAcceleratorController(new NestedAcceleratorDelegate));
-  accelerator_controller_.reset(new AcceleratorController);
+  accelerator_controller_.reset(new AcceleratorController(
+                                        accelerator_history_.get()));
   maximize_mode_controller_.reset(new MaximizeModeController());
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
@@ -927,7 +930,8 @@ void Shell::Init(const ShellInitParams& init_params) {
   AddPreTargetHandler(input_method_filter_.get());
 
   accelerator_filter_.reset(new ::wm::AcceleratorFilter(
-      scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass()));
+      scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass(),
+      accelerator_history_.get()));
   AddPreTargetHandler(accelerator_filter_.get());
 
   event_transformation_handler_.reset(new EventTransformationHandler);