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());

[Jun Mukai, 2014/11/15 01:56:33]

Can we move it into accelerator_filter_ instead of here?

[afakhry, 2014/11/15 02:40:31]

I already tried that, but it didn't work. It was causing a failure in the unit
tests. Accelerator filter has different conditions for creating and accelerator
than those needed by the focus manager and the accelerator controller.

I can add a TODO(afakhry) to figure out a way to combine them.

[Jun Mukai, 2014/11/17 17:39:20]

Which test fails for why?  It does not make much sense doing like this for test.
How hard to fix the test code?

[afakhry, 2014/11/17 23:10:18]

Done.

+
   accelerator_filter_.reset(new ::wm::AcceleratorFilter(
       scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass()));
   AddPreTargetHandler(accelerator_filter_.get());