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

Side by Side Diff: views/events/event_gtk.cc

Issue 6591120: Update MouseEvent (initial pass). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 9 years, 9 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 | « views/events/event.cc ('k') | views/events/event_win.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/events/event.h" 5 #include "views/events/event.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" 10 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 LocatedEvent::LocatedEvent(NativeEvent2 native_event_2, 135 LocatedEvent::LocatedEvent(NativeEvent2 native_event_2,
136 FromNativeEvent2 from_native) 136 FromNativeEvent2 from_native)
137 : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) { 137 : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
138 // No one should ever call this on Gtk-views. 138 // No one should ever call this on Gtk-views.
139 // TODO(msw): remove once we rid views of Gtk/Gdk. 139 // TODO(msw): remove once we rid views of Gtk/Gdk.
140 NOTREACHED(); 140 NOTREACHED();
141 } 141 }
142 #endif 142 #endif
143 143
144 //////////////////////////////////////////////////////////////////////////////// 144 ////////////////////////////////////////////////////////////////////////////////
145 // MouseEvent, public:
146
147 MouseEvent::MouseEvent(NativeEvent native_event)
148 : LocatedEvent(native_event) {
149 }
150
151 #if !defined(TOUCH_UI)
152 MouseEvent::MouseEvent(NativeEvent2 native_event_2,
153 FromNativeEvent2 from_native)
154 : LocatedEvent(native_event_2, from_native) {
155 // No one should ever call this on Gtk-views.
156 // TODO(msw): remove once we rid views of Gtk/Gdk.
157 NOTREACHED();
158 }
159 #endif
160
161 ////////////////////////////////////////////////////////////////////////////////
145 // KeyEvent, public: 162 // KeyEvent, public:
146 163
147 KeyEvent::KeyEvent(NativeEvent native_event) 164 KeyEvent::KeyEvent(NativeEvent native_event)
148 : Event(native_event, EventTypeFromNative(native_event), 165 : Event(native_event, EventTypeFromNative(native_event),
149 GetFlagsFromGdkState(GetGdkStateFromNative(native_event))), 166 GetFlagsFromGdkState(GetGdkStateFromNative(native_event))),
150 key_code_(ui::WindowsKeyCodeForGdkKeyCode( 167 key_code_(ui::WindowsKeyCodeForGdkKeyCode(
151 GetGdkEventKeyFromNative(native_event)->keyval)) { 168 GetGdkEventKeyFromNative(native_event)->keyval)) {
152 } 169 }
153 170
154 #if !defined(TOUCH_UI) 171 #if !defined(TOUCH_UI)
155 KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native) 172 KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native)
156 : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) { 173 : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
157 // No one should ever call this on Gtk-views. 174 // No one should ever call this on Gtk-views.
158 // TODO(beng): remove once we rid views of Gtk/Gdk. 175 // TODO(beng): remove once we rid views of Gtk/Gdk.
159 NOTREACHED(); 176 NOTREACHED();
160 } 177 }
161 #endif 178 #endif
162 179
163 //////////////////////////////////////////////////////////////////////////////// 180 ////////////////////////////////////////////////////////////////////////////////
164 // MouseWheelEvent, public: 181 // MouseWheelEvent, public:
165 182
166 MouseWheelEvent::MouseWheelEvent(NativeEvent native_event) 183 MouseWheelEvent::MouseWheelEvent(NativeEvent native_event)
167 : LocatedEvent(native_event), 184 : MouseEvent(native_event),
168 offset_(GetMouseWheelOffset(native_event)) { 185 offset_(GetMouseWheelOffset(native_event)) {
169 } 186 }
170 187
171 #if !defined(TOUCH_UI) 188 #if !defined(TOUCH_UI)
172 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2, 189 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
173 FromNativeEvent2 from_native) 190 FromNativeEvent2 from_native)
174 : LocatedEvent(native_event_2, from_native) { 191 : MouseEvent(native_event_2, from_native) {
175 // No one should ever call this on Gtk-views. 192 // No one should ever call this on Gtk-views.
176 // TODO(msw): remove once we rid views of Gtk/Gdk. 193 // TODO(msw): remove once we rid views of Gtk/Gdk.
177 NOTREACHED(); 194 NOTREACHED();
178 } 195 }
179 #endif 196 #endif
180 197
181 } // namespace views 198 } // namespace views
OLDNEW
« no previous file with comments | « views/events/event.cc ('k') | views/events/event_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698