Regression: Search+Key pops up app launcher

ui/views/focus/focus_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/focus/focus_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ui/base/accelerators/accelerator.h"
+#include "ui/base/accelerators/accelerator_history.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/focus/focus_manager_delegate.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/focus/widget_focus_manager.h"
@@ skipping 28 matching lines @@
 
 bool FocusManager::OnKeyEvent(const ui::KeyEvent& event) {
   const int key_code = event.key_code();
 
   if (event.type() != ui::ET_KEY_PRESSED && event.type() != ui::ET_KEY_RELEASED)
     return false;
 
   if (shortcut_handling_suspended())
     return true;
 
-  int modifiers = ui::EF_NONE;
-  if (event.IsShiftDown())
-    modifiers |= ui::EF_SHIFT_DOWN;
-  if (event.IsControlDown())
-    modifiers |= ui::EF_CONTROL_DOWN;
-  if (event.IsAltDown())
-    modifiers |= ui::EF_ALT_DOWN;
-#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
-  if (event.IsCommandDown())
-    modifiers |= ui::EF_COMMAND_DOWN;
-#endif
-  ui::Accelerator accelerator(event.key_code(), modifiers);
-  accelerator.set_type(event.type());
-  accelerator.set_is_repeat(event.IsRepeat());
+  ui::Accelerator accelerator(ui::AcceleratorHistory::GetInstance()->
+                              GetCurrentAccelerator());
 
   if (event.type() == ui::ET_KEY_PRESSED) {
     // If the focused view wants to process the key event as is, let it be.
     if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event) &&
         !accelerator_manager_->HasPriorityHandler(accelerator))
       return true;
 
     // Intercept Tab related messages for focus traversal.
     // Note that we don't do focus traversal if the root window is not part of
     // the active window hierarchy as this would mean we have no focused view
@@ skipping 518 matching lines @@
   }
   if (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN) {
     AdvanceFocus(false);
     return true;
   }
 
   return false;
 }
 
 }  // namespace views