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

Unified Diff: views/events/event_gtk.cc

Issue 6591120: Update MouseEvent (initial pass). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup more MouseEvent related code. Created 9 years, 10 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
Index: views/events/event_gtk.cc
diff --git a/views/events/event_gtk.cc b/views/events/event_gtk.cc
index 9e38cffa01e1160605b33ee555ff4a533d003df1..9557f6a9795550bc1a5fff1b7cb819aa082c7698 100644
--- a/views/events/event_gtk.cc
+++ b/views/events/event_gtk.cc
@@ -154,6 +154,21 @@ LocatedEvent::LocatedEvent(NativeEvent2 native_event_2,
#endif
////////////////////////////////////////////////////////////////////////////////
+// MouseEvent, public:
+
+MouseEvent::MouseEvent(NativeEvent native_event)
+ : LocatedEvent(native_event) {
+}
+
+MouseEvent::MouseEvent(NativeEvent2 native_event_2,
+ FromNativeEvent2 from_native)
Ben Goodger (Google) 2011/03/07 22:08:42 I think you need a #if !defined(TOUCH_UI) around t
msw 2011/03/07 23:57:21 Done.
+ : LocatedEvent(native_event_2, from_native) {
+ // No one should ever call this on Gtk-views.
+ // TODO(msw): remove once we rid views of Gtk/Gdk.
+ NOTREACHED();
+}
+
+////////////////////////////////////////////////////////////////////////////////
// KeyEvent, public:
KeyEvent::KeyEvent(NativeEvent native_event)
@@ -176,14 +191,14 @@ KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native)
// MouseWheelEvent, public:
MouseWheelEvent::MouseWheelEvent(NativeEvent native_event)
- : LocatedEvent(native_event),
+ : MouseEvent(native_event),
offset_(GetMouseWheelOffset(native_event)) {
}
#if !defined(TOUCH_UI)
MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
FromNativeEvent2 from_native)
- : LocatedEvent(native_event_2, from_native) {
+ : MouseEvent(native_event_2, from_native) {
// No one should ever call this on Gtk-views.
// TODO(msw): remove once we rid views of Gtk/Gdk.
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698