diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-16 04:21:56 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-16 04:21:56 +0000 |
| commit | 9d6182fbc636841f21e86a6479c7de9ecf310428 (patch) | |
| tree | 6c762506b5d8830a4d868204cbd9bf9a5e81c710 /ash/shell.cc | |
| parent | 4c090d2e47966acc72365fad22612f2235d89396 (diff) | |
| download | chromium_src-9d6182fbc636841f21e86a6479c7de9ecf310428.zip chromium_src-9d6182fbc636841f21e86a6479c7de9ecf310428.tar.gz chromium_src-9d6182fbc636841f21e86a6479c7de9ecf310428.tar.bz2 | |
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
Previously landed in r251382, but reverted in r251433 because it broke debug builds.
Review URL: https://codereview.chromium.org/165463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index dfdb7b6..4789a88 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -58,7 +58,6 @@ #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" @@ -627,7 +626,6 @@ Shell::~Shell() { RemovePreTargetHandler(speech_feedback_handler_.get()); speech_feedback_handler_.reset(); #endif - RemovePreTargetHandler(event_rewriter_filter_.get()); RemovePreTargetHandler(user_activity_detector_.get()); RemovePreTargetHandler(overlay_filter_.get()); RemovePreTargetHandler(input_method_filter_.get()); @@ -840,8 +838,6 @@ 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 |