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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/events/event.cc ('k') | ui/views/widget/native_widget_aura.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 ////////////////////////////////////////////////////////////////////////////////
14 // LocatedEvent, protected: 14 // LocatedEvent, protected:
15 15
16 LocatedEvent::LocatedEvent(const NativeEvent& native_event) 16 LocatedEvent::LocatedEvent(const NativeEvent& native_event)
17 : Event(native_event, native_event->type(), native_event->flags()), 17 : Event(native_event, native_event->type(), native_event->flags()),
18 location_(static_cast<ui::LocatedEvent*>(native_event)->location()) { 18 location_(static_cast<ui::LocatedEvent*>(native_event)->location()) {
19 } 19 }
20 20
21 //////////////////////////////////////////////////////////////////////////////// 21 ////////////////////////////////////////////////////////////////////////////////
22 // TouchEvent, public: 22 // TouchEvent, public:
23 23
24 TouchEvent::TouchEvent(const NativeEvent& event) 24 TouchEvent::TouchEvent(const NativeEvent& event)
25 : LocatedEvent(event), 25 : LocatedEvent(event),
26 touch_id_(static_cast<ui::TouchEventImpl*>(event)->touch_id()), 26 touch_id_(static_cast<ui::TouchEvent*>(event)->touch_id()),
27 radius_x_(static_cast<ui::TouchEventImpl*>(event)->radius_x()), 27 radius_x_(static_cast<ui::TouchEvent*>(event)->radius_x()),
28 radius_y_(static_cast<ui::TouchEventImpl*>(event)->radius_y()), 28 radius_y_(static_cast<ui::TouchEvent*>(event)->radius_y()),
29 rotation_angle_( 29 rotation_angle_(
30 static_cast<ui::TouchEventImpl*>(event)->rotation_angle()), 30 static_cast<ui::TouchEvent*>(event)->rotation_angle()),
31 force_(static_cast<ui::TouchEventImpl*>(event)->force()) { 31 force_(static_cast<ui::TouchEvent*>(event)->force()) {
32 } 32 }
33 33
34 //////////////////////////////////////////////////////////////////////////////// 34 ////////////////////////////////////////////////////////////////////////////////
35 // MouseWheelEvent, public: 35 // MouseWheelEvent, public:
36 36
37 MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event) 37 MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event)
38 : MouseEvent(native_event), 38 : MouseEvent(native_event),
39 offset_(ui::GetMouseWheelOffset(native_event->native_event())) { 39 offset_(ui::GetMouseWheelOffset(native_event->native_event())) {
40 } 40 }
41 41
42 //////////////////////////////////////////////////////////////////////////////// 42 ////////////////////////////////////////////////////////////////////////////////
43 // ScrollEvent, public: 43 // ScrollEvent, public:
44 44
45 ScrollEvent::ScrollEvent(const NativeEvent& native_event) 45 ScrollEvent::ScrollEvent(const NativeEvent& native_event)
46 : MouseEvent(native_event) { 46 : MouseEvent(native_event) {
47 CHECK(ui::GetScrollOffsets( 47 CHECK(ui::GetScrollOffsets(
48 native_event->native_event(), &x_offset_, &y_offset_)); 48 native_event->native_event(), &x_offset_, &y_offset_));
49 } 49 }
50 50
51 //////////////////////////////////////////////////////////////////////////////// 51 ////////////////////////////////////////////////////////////////////////////////
52 // GestureEvent, public: 52 // GestureEvent, public:
53 53
54 GestureEvent::GestureEvent(const NativeEvent& event) 54 GestureEvent::GestureEvent(const NativeEvent& event)
55 : LocatedEvent(event), 55 : LocatedEvent(event),
56 details_(static_cast<ui::GestureEventImpl*>(event)->details()) { 56 details_(static_cast<ui::GestureEventImpl*>(event)->details()) {
57 } 57 }
58 58
59 int GestureEvent::GetLowestTouchId() const {
60 return native_event() ? static_cast<ui::GestureEventImpl*>(
61 native_event())->GetLowestTouchId() : 0;
62 }
63
64 } // namespace views 59 } // namespace views
OLDNEW
« 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