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..ede2cc3df3dabc51953a03e4143ac39e23dfb244 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;
@@ -117,10 +118,6 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
     return &exit_warning_handler_;
   }
 
-  const ui::Accelerator& previous_accelerator_for_test() const {
-    return previous_accelerator_;
-  }
-
  private:
   FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest, GlobalAccelerators);
   FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest,
@@ -142,6 +139,7 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
       scoped_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate);
 
+

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

remove this blank line

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

Done.

   scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
 
   // TODO(derat): BrightnessControlDelegate is also used by the system tray;
@@ -152,10 +150,6 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
       keyboard_brightness_control_delegate_;
   scoped_ptr<ScreenshotDelegate> screenshot_delegate_;
 
-  // Remember previous accelerator as some accelerator needs to be fired
-  // with a specific sequence.
-  ui::Accelerator previous_accelerator_;
-
   // Handles the exit accelerator which requires a double press to exit and
   // shows a popup with an explanation.
   ExitWarningHandler exit_warning_handler_;