Consolidate/cleanup event cracking code; single out GdkEvents.

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 88 matching lines @@
   flags |= (state & GDK_LOCK_MASK) ? ui::EF_CAPS_LOCK_DOWN : 0;
   flags |= (state & GDK_CONTROL_MASK) ? ui::EF_CONTROL_DOWN : 0;
   flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : 0;
   flags |= (state & GDK_MOD1_MASK) ? ui::EF_ALT_DOWN : 0;
   flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_BUTTON_DOWN : 0;
   flags |= (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_BUTTON_DOWN : 0;
   flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
   return flags;
 }
 
-}  // namespace
-
-////////////////////////////////////////////////////////////////////////////////
-// Event, public:
-
-// static
-int Event::GetFlagsFromGdkEvent(NativeEvent native_event) {
+// Get the ui event flags from a native GdkEvent.
+int GetFlagsFromGdkEvent(NativeEvent native_event) {
   int flags = GetFlagsFromGdkState(GetGdkStateFromNative(native_event));
   if (native_event->type == GDK_2BUTTON_PRESS)
     flags |= ui::EF_IS_DOUBLE_CLICK;
   if (native_event->type == GDK_BUTTON_PRESS ||
       native_event->type == GDK_2BUTTON_PRESS ||
       native_event->type == GDK_3BUTTON_PRESS ||
       native_event->type == GDK_BUTTON_RELEASE) {
     switch (native_event->button.button) {
       case 1:
         return flags | ui::EF_LEFT_BUTTON_DOWN;
       case 2:
         return flags | ui::EF_MIDDLE_BUTTON_DOWN;
       case 3:
         return flags | ui::EF_RIGHT_BUTTON_DOWN;
     }
   }
   return flags;
 }
 
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // Event, private:
 
 void Event::Init() {
   native_event_ = NULL;
   native_event_2_ = NULL;
 }
 
 void Event::InitWithNativeEvent(NativeEvent native_event) {
   native_event_ = native_event;
@@ skipping 31 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent, public:
 
 MouseWheelEvent::MouseWheelEvent(NativeEvent native_event)
     : MouseEvent(native_event),
       offset_(GetMouseWheelOffset(native_event)) {
 }
 
 }  // namespace views