diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 01:14:43 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 01:14:43 +0000 |
| commit | 5b174e0a00bb70bd3f6a032cdeeee133d028ac95 (patch) | |
| tree | 2e1f37aef5a47c6d812646e60d6feb838a3c025e /ash/tooltips | |
| parent | df2ac9a2116238c9b4dda565ff8e5378110f09b1 (diff) | |
| download | chromium_src-5b174e0a00bb70bd3f6a032cdeeee133d028ac95.zip chromium_src-5b174e0a00bb70bd3f6a032cdeeee133d028ac95.tar.gz chromium_src-5b174e0a00bb70bd3f6a032cdeeee133d028ac95.tar.bz2 | |
events: Get rid of GestureStatus in favour of EventResult.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10912063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 4 | ||||
| -rw-r--r-- | ash/tooltips/tooltip_controller.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index e3ec0ea..4651d88 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -305,10 +305,10 @@ ui::TouchStatus TooltipController::PreHandleTouchEvent( return ui::TOUCH_STATUS_UNKNOWN; } -ui::GestureStatus TooltipController::PreHandleGestureEvent( +ui::EventResult TooltipController::PreHandleGestureEvent( aura::Window* target, ui::GestureEvent* event) { - return ui::GESTURE_STATUS_UNKNOWN; + return ui::ER_UNHANDLED; } void TooltipController::OnWindowDestroyed(aura::Window* window) { diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h index a1a110f..42145a8 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -49,7 +49,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient, virtual ui::TouchStatus PreHandleTouchEvent( aura::Window* target, ui::TouchEvent* event) OVERRIDE; - virtual ui::GestureStatus PreHandleGestureEvent(aura::Window* target, + virtual ui::EventResult PreHandleGestureEvent(aura::Window* target, ui::GestureEvent* event) OVERRIDE; // Overridden from aura::WindowObserver. |