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

Unified Diff: chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix new addition Created 8 years, 2 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/ui/gtk/browser_window_gtk.cc ('k') | chrome/browser/ui/panels/display_settings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
index 88bc22fb0a9cd4545782ff7d73904b3dd512f5e2..6d5337f6493dc89026d6815ab45f24b61b335e3f 100644
--- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
@@ -85,7 +85,7 @@ DraggedTabControllerGtk::~DraggedTabControllerGtk() {
}
void DraggedTabControllerGtk::CaptureDragInfo(const gfx::Point& mouse_offset) {
- start_screen_point_ = gfx::Screen::GetCursorScreenPoint();
+ start_screen_point_ = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
mouse_offset_ = mouse_offset;
}
@@ -248,7 +248,8 @@ void DraggedTabControllerGtk::Observe(
}
gfx::Point DraggedTabControllerGtk::GetWindowCreatePoint() const {
- gfx::Point creation_point = gfx::Screen::GetCursorScreenPoint();
+ gfx::Point creation_point =
+ gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
gfx::Point distance_from_origin =
dragged_view_->GetDistanceFromTabStripOriginToMousePointer();
// TODO(dpapad): offset also because of tabstrip origin being different than
@@ -261,7 +262,8 @@ void DraggedTabControllerGtk::ContinueDragging() {
// TODO(jhawkins): We don't handle the situation where the last tab is dragged
// out of a window, so we'll just go with the way Windows handles dragging for
// now.
- gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint();
+ gfx::Point screen_point =
+ gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
// Determine whether or not we have dragged over a compatible TabStrip in
// another browser window. If we have, we should attach to it and start
@@ -876,7 +878,8 @@ void DraggedTabControllerGtk::BringWindowUnderMouseToFront() {
gfx::NativeView dragged_tab = dragged_view_->widget();
dock_windows_.insert(dragged_tab);
window = DockInfo::GetLocalProcessWindowAtPoint(
- gfx::Screen::GetCursorScreenPoint(), dock_windows_);
+ gfx::Screen::GetNativeScreen()->GetCursorScreenPoint(),
+ dock_windows_);
dock_windows_.erase(dragged_tab);
}
« no previous file with comments | « chrome/browser/ui/gtk/browser_window_gtk.cc ('k') | chrome/browser/ui/panels/display_settings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698