diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 05:08:30 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 05:08:30 +0000 |
| commit | e93b70ccbb53c6fec20427019b421a05a371114e (patch) | |
| tree | 5e836b9d26f56a633f2ad0316cdf0ea1dd9fe98d /ash/launcher/launcher_view.cc | |
| parent | 1940c4ee397232a4948b0328e728024ea19e3f5f (diff) | |
| download | chromium_src-e93b70ccbb53c6fec20427019b421a05a371114e.zip chromium_src-e93b70ccbb53c6fec20427019b421a05a371114e.tar.gz chromium_src-e93b70ccbb53c6fec20427019b421a05a371114e.tar.bz2 | |
events: Change gesture-event handler in EventHandler to not return any values.
The EventHandler overriddes should mark the event as having been processed
(Event::SetHandled) when the event triggered an action, or stop the propagation
of the event (Event::StopPropagation) as appropriate (when the handler destroyed
the event-target, for example).
BUG=163618
Review URL: https://codereview.chromium.org/11280290
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher_view.cc')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index f51da7a..4148c87 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -788,9 +788,9 @@ views::FocusTraversable* LauncherView::GetPaneFocusTraversable() { return this; } -ui::EventResult LauncherView::OnGestureEvent(ui::GestureEvent* event) { - return gesture_handler_.ProcessGestureEvent(*event) ? - ui::ER_CONSUMED : ui::ER_UNHANDLED; +void LauncherView::OnGestureEvent(ui::GestureEvent* event) { + if (gesture_handler_.ProcessGestureEvent(*event)) + event->StopPropagation(); } void LauncherView::LauncherItemAdded(int model_index) { |