Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(494)

Unified Diff: chrome/browser/chromeos/frame/panel_controller.cc

Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge removal of compact nav. Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/ui/views/dropdown_bar_host_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/frame/panel_controller.cc
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index cf3c1c1c33fcd8bdbfbc0354fec15b5c9d39eeff..a81beff67ce3bb58faa2c825bd4f9b127c5c6cea 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -268,12 +268,12 @@ bool PanelController::TitleMousePressed(const views::MouseEvent& event) {
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();
@@ -332,12 +332,12 @@ bool PanelController::TitleMouseDragged(const views::MouseEvent& event) {
}
#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();
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/ui/views/dropdown_bar_host_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698