Add EF_IS_REPEAT flag to KeyEvent to handle repeated accelerators correctly.

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>
 
@@ skipping 12 matching lines @@
 namespace ash {
 
 struct AcceleratorData;
 class BrightnessControlDelegate;
 class ExitWarningHandler;
 class ImeControlDelegate;
 class KeyboardBrightnessControlDelegate;
 class ScreenshotDelegate;
 class VolumeControlDelegate;
 
-// Stores information about accelerator context, eg. previous accelerator
-// or if the current accelerator is repeated or not.
-class ASH_EXPORT AcceleratorControllerContext {
- public:
-  AcceleratorControllerContext();
-  ~AcceleratorControllerContext() {}
-
-  // Updates context - determines if the accelerator is repeated, as well as
-  // event type of the previous accelerator.
-  void UpdateContext(const ui::Accelerator& accelerator);
-
-  const ui::Accelerator& previous_accelerator() const {
-    return previous_accelerator_;
-  }
-  bool repeated() const {
-    return current_accelerator_ == previous_accelerator_ &&
-        current_accelerator_.type() != ui::ET_UNKNOWN;
-  }
-
- private:
-  ui::Accelerator current_accelerator_;
-  // Used for NEXT_IME and DISABLE_CAPS_LOCK accelerator actions.
-  ui::Accelerator previous_accelerator_;
-
-  DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerContext);
-};
-
 // AcceleratorController provides functions for registering or unregistering
 // global keyboard accelerators, which are handled earlier than any windows. It
 // also implements several handlers as an accelerator target.
 class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
  public:
   AcceleratorController();
   virtual ~AcceleratorController();
 
   // Registers a global keyboard accelerator for the specified target. If
   // multiple targets are registered for an accelerator, a target registered
@@ skipping 38 matching lines @@
       scoped_ptr<ImeControlDelegate> ime_control_delegate);
   void SetScreenshotDelegate(
       scoped_ptr<ScreenshotDelegate> screenshot_delegate);
   BrightnessControlDelegate* brightness_control_delegate() const {
     return brightness_control_delegate_.get();
   }
   ScreenshotDelegate* screenshot_delegate() {
     return screenshot_delegate_.get();
   }
 
-  // Provides access to an object holding contextual information.
-  AcceleratorControllerContext* context() {
-    return &context_;
-  }
-
   // Provides access to the ExitWarningHandler for testing.
   ExitWarningHandler* GetExitWarningHandlerForTest() {
     return &exit_warning_handler_;
   }
 
+  const ui::Accelerator& previous_accelerator_for_test() const {
+    return previous_accelerator_;
+  }
+
  private:
   FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest, GlobalAccelerators);
 
   // Initializes the accelerators this class handles as a target.
   void Init();
 
   // Registers the specified accelerators.
   void RegisterAccelerators(const AcceleratorData accelerators[],
                             size_t accelerators_length);
 
   void SetKeyboardBrightnessControlDelegate(
       scoped_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate);
 
   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_;
 
-  // Contextual information, eg. if the current accelerator is repeated.
-  AcceleratorControllerContext context_;
+  // 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_;
 
   // 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 10 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_