diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 16:21:44 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 16:21:44 +0000 |
| commit | 2487bee42ccd4deca3b08d9c267b4bb285f95d45 (patch) | |
| tree | 5fec6ae9f10cea17fd452c45a3207cf62e97bbfd /ash/tooltips | |
| parent | a9434345eaa19590174bf7bd262879b6a84232d6 (diff) | |
| download | chromium_src-2487bee42ccd4deca3b08d9c267b4bb285f95d45.zip chromium_src-2487bee42ccd4deca3b08d9c267b4bb285f95d45.tar.gz chromium_src-2487bee42ccd4deca3b08d9c267b4bb285f95d45.tar.bz2 | |
Remove GestureEvent interface, and rename GestureEventImpl to GestureEvent.
This also includes some changes in RenderWidgetHostViewWin to change the way it creates gesture events.
BUG=125937
Review URL: https://chromiumcodereview.appspot.com/10824247
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 2 | ||||
| -rw-r--r-- | ash/tooltips/tooltip_controller.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 1be88a9..ed2528f 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -309,7 +309,7 @@ ui::TouchStatus TooltipController::PreHandleTouchEvent( ui::GestureStatus TooltipController::PreHandleGestureEvent( aura::Window* target, - ui::GestureEventImpl* event) { + ui::GestureEvent* event) { return ui::GESTURE_STATUS_UNKNOWN; } diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h index 0c1190b..a1a110f 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -50,7 +50,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient, aura::Window* target, ui::TouchEvent* event) OVERRIDE; virtual ui::GestureStatus PreHandleGestureEvent(aura::Window* target, - ui::GestureEventImpl* event) OVERRIDE; + ui::GestureEvent* event) OVERRIDE; // Overridden from aura::WindowObserver. virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; |