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

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

Issue 10828265: Replace views::LocatedEvent with ui::LocatedEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/view.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
===================================================================
--- ui/views/events/event_aura.cc (revision 151267)
+++ ui/views/events/event_aura.cc (working copy)
@@ -10,21 +10,15 @@
namespace views {
-////////////////////////////////////////////////////////////////////////////////
-// LocatedEvent, protected:
-
-LocatedEvent::LocatedEvent(const ui::NativeEvent& native_event)
- : Event(native_event->native_event(),
- native_event->type(),
- native_event->flags()),
- location_(static_cast<ui::LocatedEvent*>(native_event)->location()) {
+MouseEvent::MouseEvent(const ui::NativeEvent& native_event)
+ : LocatedEvent(static_cast<const ui::LocatedEvent&>(*native_event)) {
}
////////////////////////////////////////////////////////////////////////////////
// TouchEvent, public:
TouchEvent::TouchEvent(const ui::NativeEvent& event)
- : LocatedEvent(event),
+ : LocatedEvent(static_cast<const ui::LocatedEvent&>(*event)),
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()),
@@ -54,7 +48,7 @@
// GestureEvent, public:
GestureEvent::GestureEvent(const ui::NativeEvent& event)
- : LocatedEvent(event),
+ : LocatedEvent(static_cast<const ui::LocatedEvent&>(*event)),
details_(static_cast<ui::GestureEvent*>(event)->details()) {
}
« no previous file with comments | « ui/views/events/event.cc ('k') | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698