Regression: Search+Key pops up app launcher

ash/accelerators/accelerator_controller.h

 // 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.
 
 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
 #include <map>
 #include <set>
 
 #include "ash/accelerators/exit_warning_handler.h"
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #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;
 }
 
 namespace ash {
 
 struct AcceleratorData;
 class BrightnessControlDelegate;
 class ExitWarningHandler;
@@ skipping 83 matching lines @@
   ScreenshotDelegate* screenshot_delegate() {
     return screenshot_delegate_.get();
   }
 
   // Provides access to the ExitWarningHandler for testing.
   ExitWarningHandler* GetExitWarningHandlerForTest() {
     return &exit_warning_handler_;
   }
 
   const ui::Accelerator& previous_accelerator_for_test() const {
-    return previous_accelerator_;
+    return GetPreviousAccelerator();
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest, GlobalAccelerators);
   FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest,
                            DontRepeatToggleFullscreen);
 
   // Initializes the accelerators this class handles as a target.
   void Init();
 
   // Registers the specified accelerators.
   void RegisterAccelerators(const AcceleratorData accelerators[],
                             size_t accelerators_length);
 
   // Get the accelerator restriction for the given action. Supply an |action|
   // of -1 to get restrictions that apply for the current context.
   AcceleratorProcessingRestriction GetAcceleratorProcessingRestriction(
       int action);
 
   void SetKeyboardBrightnessControlDelegate(
       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;
   // move it outside of this class.
   scoped_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   scoped_ptr<ImeControlDelegate> ime_control_delegate_;
   scoped_ptr<KeyboardBrightnessControlDelegate>
       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_;
+  ui::AcceleratorEvent previous_accelerator_;
 
   // Handles the exit accelerator which requires a double press to exit and
   // shows a popup with an explanation.
   ExitWarningHandler exit_warning_handler_;
 
   // A map from accelerators to the AcceleratorAction values, which are used in
   // the implementation.
   std::map<ui::Accelerator, int> accelerators_;
 
   // Actions allowed when the user is not signed in.
@@ skipping 12 matching lines @@
   std::set<int> actions_allowed_in_app_mode_;
   // Actions disallowed if there are no windows.
   std::set<int> actions_needing_window_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_