Consolidate Widget Event code, other cleanup.

views/window/window_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/window/window_gtk.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/path.h"
@@ skipping 106 matching lines @@
 
 gboolean WindowGtk::OnButtonPress(GtkWidget* widget, GdkEventButton* event) {
   int x = 0, y = 0;
   GetContainedWidgetEventCoordinates(event, &x, &y);
 
   int hittest_code =
       GetWindow()->non_client_view()->NonClientHitTest(gfx::Point(x, y));
   switch (hittest_code) {
     case HTCAPTION: {
       MouseEvent mouse_pressed(ui::ET_MOUSE_PRESSED, event->x, event->y,
-                               WidgetGtk::GetFlagsForEventButton(*event));
+          Event::GetFlagsFromGdkEvent(reinterpret_cast<GdkEvent*>(event)));
       // Start dragging if the mouse event is a single click and *not* a right
       // click. If it is a right click, then pass it through to
       // WidgetGtk::OnButtonPress so that View class can show ContextMenu upon a
       // mouse release event. We only start drag on single clicks as we get a
       // crash in Gtk on double/triple clicks.
       if (event->type == GDK_BUTTON_PRESS &&
           !mouse_pressed.IsOnlyRightMouseButton()) {
         gfx::Point screen_point(event->x, event->y);
         View::ConvertPointToScreen(GetRootView(), &screen_point);
         gtk_window_begin_move_drag(GetNativeWindow(), event->button,
@@ skipping 324 matching lines @@
   GetWindow()->window_delegate()->SaveWindowPlacement(GetBounds(), maximized);
 }
 
 void WindowGtk::OnDestroy(GtkWidget* widget) {
   delegate_->OnNativeWindowDestroying();
   WidgetGtk::OnDestroy(widget);
   delegate_->OnNativeWindowDestroyed();
 }
 
 }  // namespace views