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

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: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/events/event.cc ('k') | views/events/event_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/events/event_gtk.cc
diff --git a/views/events/event_gtk.cc b/views/events/event_gtk.cc
index a82abd54c683dfd3a9c6230de3694cfe428ef37f..8b2936913f388db852f76f30163ccf79eddc1a14 100644
--- a/views/events/event_gtk.cc
+++ b/views/events/event_gtk.cc
@@ -142,6 +142,23 @@ LocatedEvent::LocatedEvent(NativeEvent2 native_event_2,
#endif
////////////////////////////////////////////////////////////////////////////////
+// MouseEvent, public:
+
+MouseEvent::MouseEvent(NativeEvent native_event)
+ : LocatedEvent(native_event) {
+}
+
+#if !defined(TOUCH_UI)
+MouseEvent::MouseEvent(NativeEvent2 native_event_2,
+ FromNativeEvent2 from_native)
+ : 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();
+}
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
// KeyEvent, public:
KeyEvent::KeyEvent(NativeEvent native_event)
@@ -164,14 +181,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();
« 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