From d03d664a47a3a0ad32c529c231017d8a0e75f439 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Fri, 14 Feb 2014 22:38:06 +0000 Subject: Revert 251382 "event-rewrite: Clean up how events are rewritten." > event-rewrite: Clean up how events are rewritten. > > Notable changes: > * Make the EventRewriter a MessagePumpObserver. This is necessary to make sure > that the event-rewrite happens before the event is dispatched. > * Move the EventRewriter in chrome/browser/chromeos (and in chromeos namespace), > since it does nothing on other platforms. > * Get rid of the event-rewrite code from ash, since it just adds an extra layer > of abstraction for no added value. > > BUG=343639 > R=derat@chromium.org, sky@chromium.org, stevenjb@chromium.org > > Review URL: https://codereview.chromium.org/165463002 This was causing the following check failure [3943:3943:0214/135331:FATAL:event_rewriter.cc(858)] Check failed: xievent->evtype == XI_ButtonPress || xievent->evtype == XI_ButtonRelease. Aborted (core dumped) TBR=sadrul@chromium.org Review URL: https://codereview.chromium.org/167273003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251433 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/shell.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ash/shell.cc') diff --git a/ash/shell.cc b/ash/shell.cc index 3a49d2e..39daa14 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -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 @@ Shell::~Shell() { 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 @@ void Shell::Init() { #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 -- cgit v1.1