Revert 251382 "event-rewrite: Clean up how events are rewritten."

trunk/src/ash/shell.cc

Index: trunk/src/ash/shell.cc
===================================================================
--- trunk/src/ash/shell.cc	(revision 251431)
+++ trunk/src/ash/shell.cc	(working copy)
@@ -58,6 +58,7 @@
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/event_client_impl.h"
+#include "ash/wm/event_rewriter_event_filter.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overlay_event_filter.h"
@@ -622,6 +623,7 @@
   RemovePreTargetHandler(magnifier_key_scroller_.get());
   magnifier_key_scroller_.reset();
 #endif
+  RemovePreTargetHandler(event_rewriter_filter_.get());
   RemovePreTargetHandler(user_activity_detector_.get());
   RemovePreTargetHandler(overlay_filter_.get());
   RemovePreTargetHandler(input_method_filter_.get());
@@ -832,6 +834,8 @@
 #endif
 
   // The order in which event filters are added is significant.
+  event_rewriter_filter_.reset(new internal::EventRewriterEventFilter);
+  AddPreTargetHandler(event_rewriter_filter_.get());
 
 #if defined(OS_CHROMEOS)
   // The StickyKeysController also rewrites events and must be added