Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: ui/views/events/event_aura.cc

Issue 10831240: Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge-tot Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/events/event.cc ('k') | ui/views/widget/native_widget_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/events/event_aura.cc
diff --git a/ui/views/events/event_aura.cc b/ui/views/events/event_aura.cc
index 7513148b415e5356acbf62b273853d875074dc95..41253a06a07a901148dd32148156fd10d739be1e 100644
--- a/ui/views/events/event_aura.cc
+++ b/ui/views/events/event_aura.cc
@@ -23,12 +23,12 @@ LocatedEvent::LocatedEvent(const NativeEvent& native_event)
TouchEvent::TouchEvent(const NativeEvent& event)
: LocatedEvent(event),
- touch_id_(static_cast<ui::TouchEventImpl*>(event)->touch_id()),
- radius_x_(static_cast<ui::TouchEventImpl*>(event)->radius_x()),
- radius_y_(static_cast<ui::TouchEventImpl*>(event)->radius_y()),
+ touch_id_(static_cast<ui::TouchEvent*>(event)->touch_id()),
+ radius_x_(static_cast<ui::TouchEvent*>(event)->radius_x()),
+ radius_y_(static_cast<ui::TouchEvent*>(event)->radius_y()),
rotation_angle_(
- static_cast<ui::TouchEventImpl*>(event)->rotation_angle()),
- force_(static_cast<ui::TouchEventImpl*>(event)->force()) {
+ static_cast<ui::TouchEvent*>(event)->rotation_angle()),
+ force_(static_cast<ui::TouchEvent*>(event)->force()) {
}
////////////////////////////////////////////////////////////////////////////////
@@ -56,9 +56,4 @@ GestureEvent::GestureEvent(const NativeEvent& event)
details_(static_cast<ui::GestureEventImpl*>(event)->details()) {
}
-int GestureEvent::GetLowestTouchId() const {
- return native_event() ? static_cast<ui::GestureEventImpl*>(
- native_event())->GetLowestTouchId() : 0;
-}
-
} // namespace views
« no previous file with comments | « ui/views/events/event.cc ('k') | ui/views/widget/native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698