Consolidate Widget Event code, other cleanup.

views/events/event.h

 // 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.
 
 #ifndef VIEWS_EVENTS_EVENT_H_
 #define VIEWS_EVENTS_EVENT_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/time.h"
@@ skipping 66 matching lines @@
            type_ == ui::ET_TOUCH_MOVED ||
            type_ == ui::ET_TOUCH_STATIONARY ||
            type_ == ui::ET_TOUCH_CANCELLED;
   }
 #endif
 
 #if defined(OS_WIN)
   // Returns the EventFlags in terms of windows flags.
   int GetWindowsFlags() const;
 #elif defined(OS_LINUX)
-  // Convert the state member on a GdkEvent to views::Event flags
-  static int GetFlagsFromGdkState(unsigned int state);
+  // Get the views::Event flags from a native GdkEvent.
+  static int GetFlagsFromGdkEvent(NativeEvent native_event);
 #endif
 
  protected:
   Event(ui::EventType type, int flags);
   Event(NativeEvent native_event, ui::EventType type, int flags);
   // Because the world is complicated, sometimes we have two different kinds of
   // NativeEvent in play in the same executable. See native_types.h for the tale
   // of woe.
   Event(NativeEvent2 native_event, ui::EventType type, int flags,
         FromNativeEvent2);
@@ skipping 295 matching lines @@
 
   // Bitmask of supported ui::DragDropTypes::DragOperation by the source.
   int source_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(DropTargetEvent);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_EVENTS_EVENT_H_