Do not use ash in chromeos::EventRewriter.

ash/sticky_keys/sticky_keys_controller.h

 // Copyright 2013 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_STICKY_KEYS_STICKY_KEYS_CONTROLLER_H_
 #define ASH_STICKY_KEYS_STICKY_KEYS_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 41 matching lines @@
 // 6. Release 1 key    : 1 Keyup event with Ctrl modifier.
 // 7. Press 2 key      : 2 Keydown event with Ctrl modifier.
 // 8. Release 2 key    : 2 Keyup event with Ctrl modifier.
 // 9. Press Ctrl key   : No event
 // 10. Release Ctrl key: Ctrl Keyup
 //
 // In the case of Chrome OS, StickyKeysController supports Shift,Alt,Ctrl
 // modifiers. Each handling or state is performed independently.
 //
 // StickyKeysController is disabled by default.
-class ASH_EXPORT StickyKeysController {
+class ASH_EXPORT StickyKeysController : public ui::EventRewriter {
  public:
   StickyKeysController();
-  virtual ~StickyKeysController();
+  ~StickyKeysController() override;
 
   // Activate sticky keys to intercept and modify incoming events.
   void Enable(bool enabled);
 
   void SetModifiersEnabled(bool mod3_enabled, bool altgr_enabled);
 
   // Returns the StickyKeyOverlay used by the controller. Ownership is not
   // passed.
   StickyKeysOverlay* GetOverlayForTest();
 
-  // Handles keyboard event. Returns an |EventRewriteStatus|, and may
-  // modify |flags|:
-  // - Returns ui::EVENT_REWRITE_DISCARD, and leaves |flags| untouched,
-  //   if the event is consumed (i.e. a sticky modifier press or release);
-  // - Returns ui::EVENT_REWRITE_REWRITTEN if the event needs to be modified
-  //   according to the returned |flags| (i.e. a sticky-modified key);
-  // - Returns ui::EVENT_REWRITE_DISPATCH_ANOTHER if the event needs to be
-  //   modified according to the returned |flags|, and there are delayed
-  //   modifier-up   events now to be retrieved using |NextDispatchEvent()|
-  //   (i.e. a sticky-modified key that ends a sticky state);
-  // - Otherwise returns ui::EVENT_REWRITE_CONTINUE and leaves |flags|
-  //   unchanged.
-  ui::EventRewriteStatus RewriteKeyEvent(const ui::KeyEvent& event,
-                                         ui::KeyboardCode key_code,
-                                         int* flags);
-
-  // Handles mouse event.
-  ui::EventRewriteStatus RewriteMouseEvent(const ui::MouseEvent& event,
-                                           int* flags);
-
-  // Handles scroll event.
-  ui::EventRewriteStatus RewriteScrollEvent(const ui::ScrollEvent& event,
-                                            int* flags);
-
-  // Obtains a pending modifier-up event. If the immediately previous
-  // call to |Rewrite...Event()| or |NextDispatchEvent()| returned
-  // ui::EVENT_REWRITE_DISPATCH_ANOTHER, this sets |new_event| and returns:
-  // - ui::EVENT_REWRITE_DISPATCH_ANOTHER if there is at least one more
-  //   pending modifier-up event;
-  // - ui::EVENT_REWRITE_REWRITE if this is the last or only modifier-up event;
-  // Otherwise, there is no pending modifier-up event, and this function
-  // returns ui::EVENT_REWRITE_CONTINUE and sets |new_event| to NULL.
+  // ui::EventRewriter:
+  ui::EventRewriteStatus RewriteEvent(
+      const ui::Event& event,
+      std::unique_ptr<ui::Event>* rewritten_event) override;
   ui::EventRewriteStatus NextDispatchEvent(
-      std::unique_ptr<ui::Event>* new_event);
+      const ui::Event& last_event,
+      std::unique_ptr<ui::Event>* new_event) override;
 
  private:
-  // Handles keyboard event. Returns true if Sticky key consumes keyboard event.
-  // Adds to |mod_down_flags| any flag to be added to the key event.
-  // Sets |released| if any modifier is to be released after the key event.
-  bool HandleKeyEvent(const ui::KeyEvent& event,
-                      ui::KeyboardCode key_code,
-                      int* mod_down_flags,
-                      bool* released);
+  // Rewrite keyboard event.
+  ui::EventRewriteStatus RewriteKeyEvent(
+      const ui::KeyEvent& event,
+      std::unique_ptr<ui::Event>* rewritten_event);
 
-  // Handles mouse event. Returns true if Sticky key consumes keyboard event.
-  // Sets |released| if any modifier is to be released after the key event.
-  bool HandleMouseEvent(const ui::MouseEvent& event,
-                        int* mod_down_flags,
-                        bool* released);
+  // Rewrite mouse event.
+  ui::EventRewriteStatus RewriteMouseEvent(
+      const ui::MouseEvent& event,
+      std::unique_ptr<ui::Event>* rewritten_event);
 
-  // Handles scroll event. Returns true if Sticky key consumes keyboard event.
-  // Sets |released| if any modifier is to be released after the key event.
-  bool HandleScrollEvent(const ui::ScrollEvent& event,
-                         int* mod_down_flags,
-                         bool* released);
+  // Rewrite scroll event.
+  ui::EventRewriteStatus RewriteScrollEvent(
+      const ui::ScrollEvent& event,
+      std::unique_ptr<ui::Event>* rewritten_event);
 
   // Updates the overlay UI with the current state of the sticky keys.
   void UpdateOverlay();
 
   // Whether sticky keys is activated and modifying events.
   bool enabled_;
 
   // Whether the current layout has a mod3 key.
   bool mod3_enabled_;
 
@@ skipping 44 matching lines @@
 // is modified.
 class ASH_EXPORT StickyKeysHandler {
  public:
   explicit StickyKeysHandler(ui::EventFlags modifier_flag);
   ~StickyKeysHandler();
 
   // Handles keyboard event. Returns true if Sticky key consumes keyboard event.
   // Sets its own modifier flag in |mod_down_flags| if it is active and needs
   // to be added to the event, and sets |released| if releasing it.
   bool HandleKeyEvent(const ui::KeyEvent& event,
-                      ui::KeyboardCode key_code,
                       int* mod_down_flags,
                       bool* released);
 
   // Handles mouse event. Returns true if sticky key consumes mouse event.
   // Sets its own modifier flag in |mod_down_flags| if it is active and needs
   // to be added to the event, and sets |released| if releasing it.
   bool HandleMouseEvent(const ui::MouseEvent& event,
                         int* mod_down_flags,
                         bool* released);
 
@@ skipping 21 matching lines @@
     NORMAL_KEY_UP,         // The non modifier key is up.
     OTHER_MODIFIER_DOWN,   // The modifier key but not monitored key is down.
     OTHER_MODIFIER_UP,     // The modifier key but not monitored key is up.
   };
 
   // Translates event type and key code to sticky keys event type.
   KeyEventType TranslateKeyEvent(ui::EventType type, ui::KeyboardCode key_code);
 
   // Handles key event in DISABLED state. Returns true if sticky keys
   // consumes the keyboard event.
-  bool HandleDisabledState(const ui::KeyEvent& event,
-                           ui::KeyboardCode key_code);
+  bool HandleDisabledState(const ui::KeyEvent& event);
 
   // Handles key event in ENABLED state. Returns true if sticky keys
   // consumes the keyboard event.
   bool HandleEnabledState(const ui::KeyEvent& event,
-                          ui::KeyboardCode key_code,
                           int* mod_down_flags,
                           bool* released);
 
   // Handles key event in LOCKED state. Returns true if sticky keys
   // consumes the keyboard event.
   bool HandleLockedState(const ui::KeyEvent& event,
-                         ui::KeyboardCode key_code,
                          int* mod_down_flags,
                          bool* released);
 
   // The modifier flag to be monitored and appended to events.
   const ui::EventFlags modifier_flag_;
 
   // The current sticky key status.
   StickyKeyState current_state_;
 
   // True if we received the TARGET_MODIFIER_DOWN event while in the DISABLED
   // state but before we receive the TARGET_MODIFIER_UP event. Normal
   // shortcuts (eg. ctrl + t) during this time will prevent a transition to
   // the ENABLED state.
   bool preparing_to_enable_;
 
   // Tracks the scroll direction of the current scroll sequence. Sticky keys
   // stops modifying the scroll events of the sequence when the direction
   // changes. If no sequence is tracked, the value is 0.
   int scroll_delta_;
 
   // The modifier up key event to be sent on non modifier key on ENABLED state.
   std::unique_ptr<ui::KeyEvent> modifier_up_event_;
 
   DISALLOW_COPY_AND_ASSIGN(StickyKeysHandler);
 };
 
 }  // namespace ash
 
 #endif  // ASH_STICKY_KEYS_STICKY_KEYS_CONTROLLER_H_