Update MouseEvent (initial pass).

views/events/event_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/events/event.h"
 
 #include <gdk/gdk.h>
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
@@ skipping 136 matching lines @@
 LocatedEvent::LocatedEvent(NativeEvent2 native_event_2,
                            FromNativeEvent2 from_native)
     : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
   // No one should ever call this on Gtk-views.
   // TODO(msw): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
 }
 #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 this ctor

[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)
     : Event(native_event, EventTypeFromNative(native_event),
             GetFlagsFromGdkState(GetGdkStateFromNative(native_event))),
       key_code_(ui::WindowsKeyCodeForGdkKeyCode(
                 GetGdkEventKeyFromNative(native_event)->keyval)) {
 }
 
 #if !defined(TOUCH_UI)
 KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native)
     : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
   // No one should ever call this on Gtk-views.
   // TODO(beng): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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();
 }
 #endif
 
 }  // namespace views