diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 21:55:34 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 21:55:34 +0000 |
| commit | 624a7c26750b6e235f0f3cb7f7d41fedc63aed49 (patch) | |
| tree | 71db7c199b077bc669b65e1b31cb24cd786d3e95 /ui/views/events/event_aura.cc | |
| parent | be97971472298304f78e61df3c7a960e25f7911b (diff) | |
| download | chromium_src-624a7c26750b6e235f0f3cb7f7d41fedc63aed49.zip chromium_src-624a7c26750b6e235f0f3cb7f7d41fedc63aed49.tar.gz chromium_src-624a7c26750b6e235f0f3cb7f7d41fedc63aed49.tar.bz2 | |
Replace views::LocatedEvent with ui::LocatedEvent
http://crbug.com/125937
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10828265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/events/event_aura.cc')
| -rw-r--r-- | ui/views/events/event_aura.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/ui/views/events/event_aura.cc b/ui/views/events/event_aura.cc index 50c126f..1b3a55f 100644 --- a/ui/views/events/event_aura.cc +++ b/ui/views/events/event_aura.cc @@ -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 @@ ScrollEvent::ScrollEvent(const ui::NativeEvent& native_event) // GestureEvent, public: GestureEvent::GestureEvent(const ui::NativeEvent& event) - : LocatedEvent(event), + : LocatedEvent(static_cast<const ui::LocatedEvent&>(*event)), details_(static_cast<ui::GestureEvent*>(event)->details()) { } |