Convert sticky keys to a chromeos::EventRewriter phase.

chrome/browser/chromeos/events/event_rewriter.h

Index: chrome/browser/chromeos/events/event_rewriter.h
diff --git a/chrome/browser/chromeos/events/event_rewriter.h b/chrome/browser/chromeos/events/event_rewriter.h
index 3763a89e0cdbbd03420207c6d7cfbba07c39c6eb..be3ddb53b19edfe98736fca4c0c6ebf102677fc8 100644
--- a/chrome/browser/chromeos/events/event_rewriter.h
+++ b/chrome/browser/chromeos/events/event_rewriter.h
@@ -23,6 +23,10 @@ typedef union _XEvent XEvent;
 
 class PrefService;
 
+namespace ash {
+class StickyKeysController;
+}
+
 namespace chromeos {
 namespace input_method {
 class ImeKeyboard;
@@ -51,7 +55,7 @@ class EventRewriter
     kDeviceAppleKeyboard,
   };
 
-  EventRewriter();
+  EventRewriter(ash::StickyKeysController* sticky_keys_controller);

[Daniel Erat, 2014/06/05 23:16:10]

add 'explicit' and a comment describing whether ownership is passed to this
class (if it is, it should take a scoped_ptr instead)

looks from the test like it can be NULL; please document that as well

[kpschoedel, 2014/06/06 17:53:23]

Done.

Ideally this will be temporary and I can move the rewriting parts of sticky key
handling directly into the rewriter in a later CL.

   virtual ~EventRewriter();
 
   // Calls DeviceAddedInternal.
@@ -98,7 +102,7 @@ class EventRewriter
 #endif
 
  private:
-  // Things that internal rewriter phases can change about an Event.
+  // Things that keyboard-related rewriter phases can change about an Event.
   struct MutableKeyState {
     int flags;
     ui::KeyboardCode key_code;
@@ -157,6 +161,9 @@ class EventRewriter
   ui::EventRewriteStatus RewriteTouchEvent(
       const ui::TouchEvent& touch_event,
       scoped_ptr<ui::Event>* rewritten_event);
+  ui::EventRewriteStatus RewriteScrollEvent(
+      const ui::ScrollEvent& scroll_event,
+      scoped_ptr<ui::Event>* rewritten_event);
 
   // Rewriter phases. These can inspect the original |event|, but operate using
   // the current |state|, which may have been modified by previous phases.
@@ -175,6 +182,8 @@ class EventRewriter
   chromeos::input_method::ImeKeyboard* ime_keyboard_for_testing_;
   const PrefService* pref_service_for_testing_;
 
+  ash::StickyKeysController* sticky_keys_controller_;

[Daniel Erat, 2014/06/05 23:16:10]

nit: add a comment describing ownership of this pointer

[kpschoedel, 2014/06/06 17:53:23]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(EventRewriter);
 };