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/touch | |
| 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/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 | 2 | ||||
| -rw-r--r-- | ash/touch/touch_uma.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index 31d3910..65b75bd 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -194,7 +194,7 @@ bool TouchObserverHUD::PreHandleMouseEvent(aura::Window* target, ui::TouchStatus TouchObserverHUD::PreHandleTouchEvent( aura::Window* target, - ui::TouchEventImpl* event) { + ui::TouchEvent* event) { if (event->touch_id() >= kMaxTouchPoints) return ui::TOUCH_STATUS_UNKNOWN; diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h index cdb2493..c3d56fe 100644 --- a/ash/touch/touch_observer_hud.h +++ b/ash/touch/touch_observer_hud.h @@ -41,7 +41,7 @@ class TouchObserverHUD : public aura::EventFilter, 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; diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index 3acd93d..ca2a826 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc @@ -256,7 +256,7 @@ void TouchUMA::RecordGestureEvent(aura::Window* target, } void TouchUMA::RecordTouchEvent(aura::Window* target, - const ui::TouchEventImpl& event) { + const ui::TouchEvent& event) { UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchRadius", static_cast<int>(std::max(event.radius_x(), event.radius_y())), 1, 500, 100); diff --git a/ash/touch/touch_uma.h b/ash/touch/touch_uma.h index 72daed9..457fdd1 100644 --- a/ash/touch/touch_uma.h +++ b/ash/touch/touch_uma.h @@ -29,7 +29,7 @@ class TouchUMA { void RecordGestureEvent(aura::Window* target, const ui::GestureEventImpl& event); void RecordTouchEvent(aura::Window* target, - const ui::TouchEventImpl& event); + const ui::TouchEvent& event); private: DISALLOW_COPY_AND_ASSIGN(TouchUMA); |