ash/wm/workspace/workspace_window_resizer.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: ash/wm/workspace/workspace_window_resizer.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

« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | chrome/browser/ui/panels/panel_mouse_watcher_timer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/workspace/workspace_window_resizer.cc

diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc

index c8e0075669dd6256504d0cfb0e216abefeb1fbd5..dfe20f8bdccea465bdfb6abbea79ffa3a33d611a 100644

--- a/ash/wm/workspace/workspace_window_resizer.cc

+++ b/ash/wm/workspace/workspace_window_resizer.cc

@@ -194,7 +194,8 @@ void WorkspaceWindowResizer::CompleteDrag(int event_flags) {

gfx::Point last_mouse_location_in_screen = last_mouse_location_;

wm::ConvertPointToScreen(window()->parent(), &last_mouse_location_in_screen);

const gfx::Display dst_display =

- gfx::Screen::GetDisplayNearestPoint(last_mouse_location_in_screen);

+ gfx::Screen::GetDisplayNearestPoint(

+ ash::Shell::GetRootNativeView(), last_mouse_location_in_screen);

if (dst_display.id() !=

gfx::Screen::GetDisplayNearestWindow(window()->GetRootWindow()).id()) {

@@ -427,7 +428,8 @@ void WorkspaceWindowResizer::AdjustBoundsForMainWindow(

gfx::Point last_mouse_location_in_screen = last_mouse_location_;

wm::ConvertPointToScreen(window()->parent(), &last_mouse_location_in_screen);

gfx::Display display =

- gfx::Screen::GetDisplayNearestPoint(last_mouse_location_in_screen);

+ gfx::Screen::GetDisplayNearestPoint(

+ ash::Shell::GetRootNativeView(), last_mouse_location_in_screen);

gfx::Rect work_area =

ScreenAsh::ConvertRectFromScreen(window()->parent(), display.work_area());

if (details_.window_component == HTCAPTION) {

@@ -544,7 +546,9 @@ void WorkspaceWindowResizer::UpdateDragPhantomWindow(const gfx::Rect& bounds,

PhantomWindowController::STYLE_DRAGGING);

// Always show the drag phantom on the |another_root| window.

drag_phantom_window_controller_->SetDestinationDisplay(

- gfx::Screen::GetDisplayMatching(another_root->GetBoundsInScreen()));

+ gfx::Screen::GetDisplayMatching(

+ ash::Shell::GetRootNativeView(),

+ another_root->GetBoundsInScreen()));

if (!layer_)

RecreateWindowLayers();

drag_phantom_window_controller_->Show(bounds_in_screen, layer_);