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/touch | |
| 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/touch')
| -rw-r--r-- | ash/touch/touch_observer_hud.cc | 2 | ||||
| -rw-r--r-- | ash/touch/touch_observer_hud.h | 2 | ||||
| -rw-r--r-- | ash/touch/touch_uma.cc | 16 | ||||
| -rw-r--r-- | ash/touch/touch_uma.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index 65b75bd..95bcc64 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -215,7 +215,7 @@ ui::TouchStatus TouchObserverHUD::PreHandleTouchEvent( ui::GestureStatus TouchObserverHUD::PreHandleGestureEvent( aura::Window* target, - ui::GestureEventImpl* event) { + ui::GestureEvent* event) { return ui::GESTURE_STATUS_UNKNOWN; } diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h index c3d56fe..48991ce 100644 --- a/ash/touch/touch_observer_hud.h +++ b/ash/touch/touch_observer_hud.h @@ -44,7 +44,7 @@ class TouchObserverHUD : public aura::EventFilter, ui::TouchEvent* event) OVERRIDE; virtual ui::GestureStatus PreHandleGestureEvent( aura::Window* target, - ui::GestureEventImpl* event) OVERRIDE; + ui::GestureEvent* event) OVERRIDE; // Overridden from views::WidgetObserver: virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index ca2a826..a43af46 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc @@ -89,7 +89,7 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(WindowTouchDetails, NULL); GestureActionType FindGestureActionType(aura::Window* window, - const ui::GestureEventImpl& event) { + const ui::GestureEvent& event) { if (!window || window->GetRootWindow() == window) { if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) return GESTURE_BEZEL_SCROLL; @@ -166,8 +166,8 @@ UMAEventType UMAEventTypeFromEvent(const ui::Event& event) { case ui::ET_GESTURE_SCROLL_END: return UMA_ET_GESTURE_SCROLL_END; case ui::ET_GESTURE_SCROLL_UPDATE: { - const ui::GestureEventImpl& gesture = - static_cast<const ui::GestureEventImpl&>(event); + const ui::GestureEvent& gesture = + static_cast<const ui::GestureEvent&>(event); if (gesture.details().touch_points() >= 4) return UMA_ET_GESTURE_SCROLL_UPDATE_4P; else if (gesture.details().touch_points() == 3) @@ -193,8 +193,8 @@ UMAEventType UMAEventTypeFromEvent(const ui::Event& event) { case ui::ET_GESTURE_PINCH_END: return UMA_ET_GESTURE_PINCH_END; case ui::ET_GESTURE_PINCH_UPDATE: { - const ui::GestureEventImpl& gesture = - static_cast<const ui::GestureEventImpl&>(event); + const ui::GestureEvent& gesture = + static_cast<const ui::GestureEvent&>(event); if (gesture.details().touch_points() >= 4) return UMA_ET_GESTURE_PINCH_UPDATE_4P; else if (gesture.details().touch_points() == 3) @@ -204,8 +204,8 @@ UMAEventType UMAEventTypeFromEvent(const ui::Event& event) { case ui::ET_GESTURE_LONG_PRESS: return UMA_ET_GESTURE_LONG_PRESS; case ui::ET_GESTURE_MULTIFINGER_SWIPE: { - const ui::GestureEventImpl& gesture = - static_cast<const ui::GestureEventImpl&>(event); + const ui::GestureEvent& gesture = + static_cast<const ui::GestureEvent&>(event); if (gesture.details().touch_points() >= 4) return UMA_ET_GESTURE_MULTIFINGER_SWIPE_4P; else if (gesture.details().touch_points() == 3) @@ -235,7 +235,7 @@ TouchUMA::~TouchUMA() { } void TouchUMA::RecordGestureEvent(aura::Window* target, - const ui::GestureEventImpl& event) { + const ui::GestureEvent& event) { UMA_HISTOGRAM_ENUMERATION("Ash.GestureCreated", UMAEventTypeFromEvent(event), UMA_ET_COUNT); diff --git a/ash/touch/touch_uma.h b/ash/touch/touch_uma.h index 457fdd1..94e1164 100644 --- a/ash/touch/touch_uma.h +++ b/ash/touch/touch_uma.h @@ -27,7 +27,7 @@ class TouchUMA { ~TouchUMA(); void RecordGestureEvent(aura::Window* target, - const ui::GestureEventImpl& event); + const ui::GestureEvent& event); void RecordTouchEvent(aura::Window* target, const ui::TouchEvent& event); |