Regression: Search+Key pops up app launcher

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index aefbdbd5b483306cf83e1970767380b024f51afb..de3988861e6e3ca6e55034231cd9a74bb464f046 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -467,16 +467,22 @@ bool HandleToggleAppList(ui::KeyboardCode key_code,
   // If something else was pressed between the Search key (LWIN)
   // being pressed and released, then ignore the release of the
   // Search key.
-  if (key_code == ui::VKEY_LWIN &&
-      (previous_event_type == ui::ET_KEY_RELEASED ||
-       previous_key_code != ui::VKEY_LWIN))
+
+  if ((key_code != ui::VKEY_BROWSER_SEARCH ||
+       accelerator.type() != ui::ET_KEY_PRESSED) &&
+      (key_code != ui::VKEY_LWIN ||
+       previous_event_type != ui::ET_KEY_PRESSED ||
+       previous_key_code != ui::VKEY_LWIN ||
+       accelerator.type() != ui::ET_KEY_RELEASED)) {
     return false;
+  }
+
   if (key_code == ui::VKEY_LWIN)
     base::RecordAction(base::UserMetricsAction("Accel_Search_LWin"));
+
   // When spoken feedback is enabled, we should neither toggle the list nor
   // consume the key since Search+Shift is one of the shortcuts the a11y
   // feature uses. crbug.com/132296
-  DCHECK_EQ(ui::VKEY_LWIN, accelerator.key_code());
   if (Shell::GetInstance()->accessibility_delegate()->
       IsSpokenFeedbackEnabled())
     return false;
@@ -657,26 +663,16 @@ bool HandleToggleCapsLock(ui::KeyboardCode key_code,
 
 #endif  // defined(OS_CHROMEOS)
 
-class AutoSet {
- public:
-  AutoSet(ui::Accelerator* scoped, ui::Accelerator new_value)
-      : scoped_(scoped), new_value_(new_value) {}
-  ~AutoSet() { *scoped_ = new_value_; }
-
- private:
-  ui::Accelerator* scoped_;
-  const ui::Accelerator new_value_;
-
-  DISALLOW_COPY_AND_ASSIGN(AutoSet);
-};
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorController, public:
 
-AcceleratorController::AcceleratorController()
-    : accelerator_manager_(new ui::AcceleratorManager) {
+AcceleratorController::AcceleratorController(
+    ui::AcceleratorHistory* accelerator_history)
+    : accelerator_manager_(new ui::AcceleratorManager),
+      accelerator_history_(accelerator_history) {
+  DCHECK(accelerator_history);
   Init();
 }
 
@@ -684,7 +680,6 @@ AcceleratorController::~AcceleratorController() {
 }
 
 void AcceleratorController::Init() {
-  previous_accelerator_.set_type(ui::ET_UNKNOWN);
   for (size_t i = 0; i < kActionsAllowedAtLoginOrLockScreenLength; ++i) {
     actions_allowed_at_login_screen_.insert(
         kActionsAllowedAtLoginOrLockScreen[i]);
@@ -738,8 +733,6 @@ void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
 }
 
 bool AcceleratorController::Process(const ui::Accelerator& accelerator) {
-  AutoSet auto_set(&previous_accelerator_, accelerator);
-
   if (ime_control_delegate_) {
     return accelerator_manager_->Process(
         ime_control_delegate_->RemapAccelerator(accelerator));
@@ -798,8 +791,10 @@ bool AcceleratorController::PerformAction(int action,
     return true;
   }
   // Type of the previous accelerator. Used by NEXT_IME and DISABLE_CAPS_LOCK.
-  const ui::EventType previous_event_type = previous_accelerator_.type();
-  const ui::KeyboardCode previous_key_code = previous_accelerator_.key_code();
+  const ui::Accelerator& previous_accelerator =
+      accelerator_history_->GetPreviousAccelerator();
+  const ui::EventType previous_event_type = previous_accelerator.type();
+  const ui::KeyboardCode previous_key_code = previous_accelerator.key_code();
 
   // You *MUST* return true when some action is performed. Otherwise, this
   // function might be called *twice*, via BrowserView::PreHandleKeyboardEvent