Revert 278342 "Convert sticky keys to a chromeos::EventRewriter ..."

trunk/src/ash/shell.cc

Index: trunk/src/ash/shell.cc
===================================================================
--- trunk/src/ash/shell.cc	(revision 278418)
+++ trunk/src/ash/shell.cc	(working copy)
@@ -889,6 +889,13 @@
 
   // 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);
@@ -923,10 +930,6 @@
     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()));