chrome/browser/ui/views/tabs/tab_drag_controller.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller.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 other os's 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

« chrome/browser/ui/views/fullscreen_exit_bubble_views.cc ('K') | « chrome/browser/ui/views/status_icons/status_tray_win.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | content/browser/web_contents/web_contents_view_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc

diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc

index 86caeb454633555522266937e5ff2bd6c511f0e3..63588995806b246cc7b45e65d2729dd7de0668e4 100644

--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc

+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc

@@ -671,7 +671,8 @@ gfx::Point TabDragController::GetWindowCreatePoint(

// If the cursor is outside the monitor area, move it inside. For example,

// dropping a tab onto the task bar on Windows produces this situation.

- gfx::Rect work_area = gfx::Screen::GetDisplayNearestPoint(origin).work_area();

+ gfx::Rect work_area = gfx::Screen::GetDisplayNearestPoint(

+ gfx::Screen::BadTwoWorldsContext(), origin).work_area();

gfx::Point create_point(origin);

if (!work_area.IsEmpty()) {

if (create_point.x() < work_area.x())

@@ -1983,7 +1984,7 @@ gfx::Point TabDragController::GetCursorScreenPoint() {

return touch_point;

}

#endif

- return gfx::Screen::GetCursorScreenPoint();

+ return gfx::Screen::GetCursorScreenPoint(gfx::Screen::BadTwoWorldsContext());

}

gfx::Point TabDragController::GetWindowOffset(