Consolidate/cleanup event cracking code; single out GdkEvents.

chrome/browser/chromeos/frame/panel_controller.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 "chrome/browser/chromeos/frame/panel_controller.h"
 
 #if defined(TOUCH_UI)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 #endif
@@ skipping 250 matching lines @@
   // for details.
   gint title_width = 1;
   gtk_window_get_size(GTK_WINDOW(title_), &title_width, NULL);
 
   mouse_down_ = true;
   mouse_down_offset_x_ = event.x() - title_width;
   mouse_down_offset_y_ = event.y();
   dragging_ = false;
 
 #if !defined(TOUCH_UI) && !defined(USE_AURA)
-  const GdkEvent* gdk_event = event.native_event();
+  const GdkEvent* gdk_event = event.gdk_event();
   GdkEventButton last_button_event = gdk_event->button;
   mouse_down_abs_x_ = last_button_event.x_root;
   mouse_down_abs_y_ = last_button_event.y_root;
 #else
-  const XEvent* xev = event.native_event_2();
+  const XEvent* xev = event.native_event();
   gfx::Point abs_location = RootLocationFromXEvent(xev);
   mouse_down_abs_x_ = abs_location.x();
   mouse_down_abs_y_ = abs_location.y();
 #endif
   return true;
 }
 
 void PanelController::TitleMouseReleased(const views::MouseEvent& event) {
   if (event.IsLeftMouseButton())
     TitleMouseCaptureLost();
@@ skipping 38 matching lines @@
 bool PanelController::TitleMouseDragged(const views::MouseEvent& event) {
   if (!mouse_down_)
     return false;
   if (event.type() != ui::ET_MOUSE_MOVED &&
       event.type() != ui::ET_MOUSE_DRAGGED) {
     NOTREACHED();
     return false;
   }
 
 #if !defined(TOUCH_UI)
-  const GdkEvent* gdk_event = event.native_event();
+  const GdkEvent* gdk_event = event.gdk_event();
   GdkEventMotion last_motion_event = gdk_event->motion;
   int x_root = last_motion_event.x_root;
   int y_root = last_motion_event.y_root;
 #else
-  const XEvent* xev = event.native_event_2();
+  const XEvent* xev = event.native_event();
   gfx::Point abs_location = RootLocationFromXEvent(xev);
   int x_root = abs_location.x();
   int y_root = abs_location.y();
 #endif
 
   if (!dragging_) {
     if (views::View::ExceededDragThreshold(x_root - mouse_down_abs_x_,
                                            y_root - mouse_down_abs_y_)) {
       dragging_ = true;
     }
@@ skipping 161 matching lines @@
     views::Button* sender, const views::Event& event) {
   if (panel_controller_ && sender == close_button_)
     panel_controller_->OnCloseButtonPressed();
 }
 
 PanelController::TitleContentView::~TitleContentView() {
   VLOG(1) << "panel: delete " << this;
 }
 
 }  // namespace chromeos