diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 22:28:04 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 22:28:04 +0000 |
| commit | 8ca8d24697eb99d14cab7028ad3b7c152dde7d56 (patch) | |
| tree | 52ed61ac468fe094769ef78b3813af0fd51ab5bd /ash/drag_drop | |
| parent | 2a848e0e4d75cd9195d15ff955014397482f9faa (diff) | |
| download | chromium_src-8ca8d24697eb99d14cab7028ad3b7c152dde7d56.zip chromium_src-8ca8d24697eb99d14cab7028ad3b7c152dde7d56.tar.gz chromium_src-8ca8d24697eb99d14cab7028ad3b7c152dde7d56.tar.bz2 | |
Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent.
BUG=125937
Review URL: https://chromiumcodereview.appspot.com/10831240
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 2 | ||||
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 5657cf2..cd99aeb 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -232,7 +232,7 @@ bool DragDropController::PreHandleMouseEvent(aura::Window* target, ui::TouchStatus DragDropController::PreHandleTouchEvent( aura::Window* target, - ui::TouchEventImpl* event) { + ui::TouchEvent* event) { // TODO(sad): Also check for the touch-id. if (!drag_drop_in_progress_) return ui::TOUCH_STATUS_UNKNOWN; diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index f3f0985..e806265 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -65,7 +65,7 @@ class ASH_EXPORT DragDropController ui::MouseEvent* event) OVERRIDE; virtual ui::TouchStatus PreHandleTouchEvent( aura::Window* target, - ui::TouchEventImpl* event) OVERRIDE; + ui::TouchEvent* event) OVERRIDE; virtual ui::GestureStatus PreHandleGestureEvent( aura::Window* target, ui::GestureEventImpl* event) OVERRIDE; |