diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 16:35:27 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 16:35:27 +0000 |
| commit | 304594c8ca8ca017c317dc74cc10d1a3656a14db (patch) | |
| tree | ed58a1b95bb9121454340bbfe6598210005a3634 /ash/accelerators | |
| parent | 2dbd513b86a1105f684c1fe2b031e5e937c53c52 (diff) | |
| download | chromium_src-304594c8ca8ca017c317dc74cc10d1a3656a14db.zip chromium_src-304594c8ca8ca017c317dc74cc10d1a3656a14db.tar.gz chromium_src-304594c8ca8ca017c317dc74cc10d1a3656a14db.tar.bz2 | |
ash: Convert all remaining EventFilters into EventHandlers.
This CL converts the following list of aura::EventFilters into ui::EventHandlers:
* MouseCursorEventFilter
* DragDropController
* LauncherTooltipManager
* TooltipController
* EventRewriterEventFilter
* OverlayEventFilter
* PanelWindowEventFilter
* SystemModalContainerEventFilter
* UserActivityDetector
* WindowCycleEventFilter
* WindowModalityController
* FrameMaximizeButton::EscapeEventFilter
* TabScrubber
Also remove AddEnvEventFilter/RemoveEnvEventFilter from Shell functions since
all the filters for the shell have been converted.
BUG=159632
Review URL: https://codereview.chromium.org/11366214
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_dispatcher.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_dispatcher.cc b/ash/accelerators/accelerator_dispatcher.cc index a825dde..d8b238f 100644 --- a/ash/accelerators/accelerator_dispatcher.cc +++ b/ash/accelerators/accelerator_dispatcher.cc @@ -72,10 +72,11 @@ bool AcceleratorDispatcher::Dispatch(const base::NativeEvent& event) { // Modifiers can be changed by the user preference, so we need to rewrite // the event explicitly. ui::KeyEvent key_event(event, false); - aura::EventFilter* event_rewriter = + ui::EventHandler* event_rewriter = ash::Shell::GetInstance()->event_rewriter_filter(); DCHECK(event_rewriter); - if (event_rewriter->PreHandleKeyEvent(associated_window_, &key_event)) + ui::EventResult result = event_rewriter->OnKeyEvent(&key_event); + if (result & ui::ER_CONSUMED) return true; ash::AcceleratorController* accelerator_controller = ash::Shell::GetInstance()->accelerator_controller(); |