Add a new constructor to KeyEvent.

views/events/event_x.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/gdkx.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
 #endif
 
@@ skipping 43 matching lines @@
     case 2:
       return ui::EF_MIDDLE_BUTTON_DOWN;
     case 3:
       return ui::EF_RIGHT_BUTTON_DOWN;
   }
 
   DLOG(WARNING) << "Unexpected button (" << button << ") received.";
   return 0;
 }
 
+ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
+  switch (native_event->type) {
+    case KeyPress:
+      return ui::ET_KEY_PRESSED;
+    case KeyRelease:
+      return ui::ET_KEY_RELEASED;
+    default:
+      NOTREACHED();
+      break;
+  }
+  return ui::ET_UNKNOWN;
+}
+
 #if defined(HAVE_XINPUT2)
 int GetButtonMaskForX2Event(XIDeviceEvent* xievent) {
   int buttonflags = 0;
 
   for (int i = 0; i < 8 * xievent->buttons.mask_len; i++) {
     if (XIMaskIsSet(xievent->buttons.mask, i)) {
       buttonflags |= GetEventFlagsForButton(i);
     }
   }
 
@@ skipping 130 matching lines @@
       }
     }
 #endif
   }
 
   return 0;
 }
 
 }  // namespace
 
-KeyEvent::KeyEvent(XEvent* xev)
-    : Event(xev->type == KeyPress ?
-            ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED,
-            GetEventFlagsFromXState(xev->xkey.state)),
-      key_code_(ui::KeyboardCodeFromXKeyEvent(xev)),
-      repeat_count_(0),
-      message_flags_(0),
-      native_event_(NULL) {
+////////////////////////////////////////////////////////////////////////////////
+// Event, private:
+
+void Event::Init() {
+  native_event_ = NULL;
+  native_event_2 = NULL;

[sadrul, 2011/02/11 16:12:47]

native_event_2_

 }
 
+void Event::InitWithNativeEvent(NativeEvent native_event) {
+  native_event_ = native_event;
+  // TODO(beng): remove once we rid views of Gtk/Gdk.
+  native_event_2_ = NULL;
+}
+
+void Event::InitWithNativeEvent2(NativeEvent2 native_event_2) {
+  native_event_ = NULL;
+  // TODO(beng): remove once we rid views of Gtk/Gdk.
+  native_event_2_ = native_event_2;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// KeyEvent, public:
+
+KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2)
+    : Event(native_event_2,
+            EventTypeFromNative(native_event_2),
+            GetEventFlagsFromXState(native_event_2->xkey.state),
+            FromNativeEvent2),
+      key_code_(ui::KeyboardCodeFromXKeyEvent(native_event_2)) {
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// MouseEvent, public:
+
 MouseEvent::MouseEvent(XEvent* xev)
     : LocatedEvent(GetMouseEventType(xev),
                    GetMouseEventLocation(xev),
                    GetMouseEventFlags(xev)) {
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// MouseWheelEvent, public:
+
 MouseWheelEvent::MouseWheelEvent(XEvent* xev)
     : LocatedEvent(ui::ET_MOUSEWHEEL,
                    GetMouseEventLocation(xev),
                    GetEventFlagsFromXState(xev->xbutton.state)),
       offset_(GetMouseWheelOffset(xev)) {
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// TouchEvent, public:
+
 #if defined(HAVE_XINPUT2)
 TouchEvent::TouchEvent(XEvent* xev)
     : LocatedEvent(GetTouchEventType(xev),
                    GetTouchEventLocation(xev),
                    GetTouchEventFlags(xev)),
       touch_id_(GetTouchIDFromXEvent(xev)) {
 }
 #endif
 
 }  // namespace views