Convert sticky keys to a chromeos::EventRewriter phase.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 3d83a68d22d9db3cb914c5b0eb5734402bb9b150..98139c665b1a48ba8cf76b27882f903166974fc6 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -889,13 +889,6 @@ void Shell::Init(const ShellInitParams& init_params) {
 
   // The order in which event filters are added is significant.
 
-#if defined(OS_CHROMEOS)
-  // The StickyKeysController also rewrites events and must be added
-  // before observers, but after the EventRewriterEventFilter.
-  sticky_keys_controller_.reset(new StickyKeysController);
-  AddPreTargetHandler(sticky_keys_controller_.get());
-#endif
-
   // wm::UserActivityDetector passes events to observers, so let them get
   // rewritten first.
   user_activity_detector_.reset(new ::wm::UserActivityDetector);
@@ -930,6 +923,10 @@ void Shell::Init(const ShellInitParams& init_params) {
     keyboard::InitializeKeyboard();
 #endif
 
+#if defined(OS_CHROMEOS)
+  sticky_keys_controller_.reset(new StickyKeysController);
+#endif
+
   lock_state_controller_.reset(new LockStateController);
   power_button_controller_.reset(new PowerButtonController(
       lock_state_controller_.get()));