Regression: Search+Key pops up app launcher

ash/accelerators/accelerator_controller.h

Index: ash/accelerators/accelerator_controller.h
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
index 9a7c579ac99df650045820ec1379b232fe3ebe41..5b279ca94d74e0beb6e67bb44b525a601b48b333 100644
--- a/ash/accelerators/accelerator_controller.h
+++ b/ash/accelerators/accelerator_controller.h
@@ -15,6 +15,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accelerators/accelerator.h"
+#include "ui/base/accelerators/accelerator_history.h"
 
 namespace ui {
 class AcceleratorManager;
@@ -118,7 +119,7 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
   }
 
   const ui::Accelerator& previous_accelerator_for_test() const {
-    return previous_accelerator_;
+    return GetPreviousAccelerator();
   }
 
  private:
@@ -142,6 +143,11 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
       scoped_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate);
 
+  // Returns the previous accelerator that should be used depending on the most
+  // recent time stamp.
+  const ui::Accelerator& GetPreviousAccelerator() const;
+
+
   scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
 
   // TODO(derat): BrightnessControlDelegate is also used by the system tray;
@@ -154,7 +160,7 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
 
   // Remember previous accelerator as some accelerator needs to be fired
   // with a specific sequence.
-  ui::Accelerator previous_accelerator_;
+  ui::AcceleratorEvent previous_accelerator_;
 
   // Handles the exit accelerator which requires a double press to exit and
   // shows a popup with an explanation.