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..f946bc911e72953dddb4c9570835dcf3e72d7a5c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -86,6 +86,7 @@
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/base/accelerators/accelerator_history.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
@@ -926,6 +927,10 @@ void Shell::Init(const ShellInitParams& init_params) {
       root_window->GetHost()->GetAcceleratedWidget()));
   AddPreTargetHandler(input_method_filter_.get());
 
+  // Keep track of the current and previous accelerators for the
+  // AcceleratorController and the FocusManager
+  AddPreTargetHandler(ui::AcceleratorHistory::GetInstance());
+
   accelerator_filter_.reset(new ::wm::AcceleratorFilter(
       scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass()));
   AddPreTargetHandler(accelerator_filter_.get());