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/accelerators | |
| 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/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_dispatcher.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ash/accelerators/accelerator_dispatcher.cc b/ash/accelerators/accelerator_dispatcher.cc index c4c4f33..6088dfe 100644 --- a/ash/accelerators/accelerator_dispatcher.cc +++ b/ash/accelerators/accelerator_dispatcher.cc @@ -15,7 +15,6 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/shell.h" -#include "ash/wm/event_rewriter_event_filter.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" @@ -93,16 +92,7 @@ uint32_t AcceleratorDispatcher::Dispatch(const base::NativeEvent& event) { return POST_DISPATCH_PERFORM_DEFAULT; if (IsKeyEvent(event)) { - // Modifiers can be changed by the user preference, so we need to rewrite - // the event explicitly. ui::KeyEvent key_event(event, false); - ui::EventHandler* event_rewriter = - ash::Shell::GetInstance()->event_rewriter_filter(); - DCHECK(event_rewriter); - event_rewriter->OnKeyEvent(&key_event); - if (key_event.stopped_propagation()) - return POST_DISPATCH_NONE; - if (IsPossibleAcceleratorNotForMenu(key_event)) { if (views::MenuController* menu_controller = views::MenuController::GetActiveInstance()) { |