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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/events/event.cc ('k') | ui/views/view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/events/event.h" 5 #include "ui/views/events/event.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/base/event.h" 8 #include "ui/base/event.h"
9 #include "ui/base/keycodes/keyboard_code_conversion.h" 9 #include "ui/base/keycodes/keyboard_code_conversion.h"
10 10
11 namespace views { 11 namespace views {
12 12
13 //////////////////////////////////////////////////////////////////////////////// 13 MouseEvent::MouseEvent(const ui::NativeEvent& native_event)
14 // LocatedEvent, protected: 14 : LocatedEvent(static_cast<const ui::LocatedEvent&>(*native_event)) {
15
16 LocatedEvent::LocatedEvent(const ui::NativeEvent& native_event)
17 : Event(native_event->native_event(),
18 native_event->type(),
19 native_event->flags()),
20 location_(static_cast<ui::LocatedEvent*>(native_event)->location()) {
21 } 15 }
22 16
23 //////////////////////////////////////////////////////////////////////////////// 17 ////////////////////////////////////////////////////////////////////////////////
24 // TouchEvent, public: 18 // TouchEvent, public:
25 19
26 TouchEvent::TouchEvent(const ui::NativeEvent& event) 20 TouchEvent::TouchEvent(const ui::NativeEvent& event)
27 : LocatedEvent(event), 21 : LocatedEvent(static_cast<const ui::LocatedEvent&>(*event)),
28 touch_id_(static_cast<ui::TouchEvent*>(event)->touch_id()), 22 touch_id_(static_cast<ui::TouchEvent*>(event)->touch_id()),
29 radius_x_(static_cast<ui::TouchEvent*>(event)->radius_x()), 23 radius_x_(static_cast<ui::TouchEvent*>(event)->radius_x()),
30 radius_y_(static_cast<ui::TouchEvent*>(event)->radius_y()), 24 radius_y_(static_cast<ui::TouchEvent*>(event)->radius_y()),
31 rotation_angle_( 25 rotation_angle_(
32 static_cast<ui::TouchEvent*>(event)->rotation_angle()), 26 static_cast<ui::TouchEvent*>(event)->rotation_angle()),
33 force_(static_cast<ui::TouchEvent*>(event)->force()) { 27 force_(static_cast<ui::TouchEvent*>(event)->force()) {
34 } 28 }
35 29
36 //////////////////////////////////////////////////////////////////////////////// 30 ////////////////////////////////////////////////////////////////////////////////
37 // MouseWheelEvent, public: 31 // MouseWheelEvent, public:
38 32
39 MouseWheelEvent::MouseWheelEvent(const ui::NativeEvent& native_event) 33 MouseWheelEvent::MouseWheelEvent(const ui::NativeEvent& native_event)
40 : MouseEvent(native_event), 34 : MouseEvent(native_event),
41 offset_(ui::GetMouseWheelOffset(native_event->native_event())) { 35 offset_(ui::GetMouseWheelOffset(native_event->native_event())) {
42 } 36 }
43 37
44 //////////////////////////////////////////////////////////////////////////////// 38 ////////////////////////////////////////////////////////////////////////////////
45 // ScrollEvent, public: 39 // ScrollEvent, public:
46 40
47 ScrollEvent::ScrollEvent(const ui::NativeEvent& native_event) 41 ScrollEvent::ScrollEvent(const ui::NativeEvent& native_event)
48 : MouseEvent(native_event) { 42 : MouseEvent(native_event) {
49 CHECK(ui::GetScrollOffsets( 43 CHECK(ui::GetScrollOffsets(
50 native_event->native_event(), &x_offset_, &y_offset_)); 44 native_event->native_event(), &x_offset_, &y_offset_));
51 } 45 }
52 46
53 //////////////////////////////////////////////////////////////////////////////// 47 ////////////////////////////////////////////////////////////////////////////////
54 // GestureEvent, public: 48 // GestureEvent, public:
55 49
56 GestureEvent::GestureEvent(const ui::NativeEvent& event) 50 GestureEvent::GestureEvent(const ui::NativeEvent& event)
57 : LocatedEvent(event), 51 : LocatedEvent(static_cast<const ui::LocatedEvent&>(*event)),
58 details_(static_cast<ui::GestureEvent*>(event)->details()) { 52 details_(static_cast<ui::GestureEvent*>(event)->details()) {
59 } 53 }
60 54
61 } // namespace views 55 } // namespace views
OLDNEW
« 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