ui/wm/core/default_screen_position_client.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

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: ui/wm/core/default_screen_position_client.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: and another rebase Created 4 years, 11 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:

Index: ui/wm/core/default_screen_position_client.cc

diff --git a/ui/wm/core/default_screen_position_client.cc b/ui/wm/core/default_screen_position_client.cc

index d26a91ed9c8f92c66495eab9cfc7de7e5a749d87..532c265aeb7eba192f559116c2beb36df4adb606 100644

--- a/ui/wm/core/default_screen_position_client.cc

+++ b/ui/wm/core/default_screen_position_client.cc

@@ -21,8 +21,9 @@ gfx::Point DefaultScreenPositionClient::GetOriginInScreen(

const aura::Window* root_window) {

gfx::Point origin_in_pixels = root_window->GetHost()->GetBounds().origin();

aura::Window* window = const_cast<aura::Window*>(root_window);

- float scale = gfx::Screen::GetScreenFor(window)->

- GetDisplayNearestWindow(window).device_scale_factor();

+ float scale = gfx::Screen::GetScreen()

+ ->GetDisplayNearestWindow(window)

+ .device_scale_factor();

return gfx::ScaleToFlooredPoint(origin_in_pixels, 1.0f / scale);

}