ui/base/layout.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/base/layout.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/base/layout.cc

diff --git a/ui/base/layout.cc b/ui/base/layout.cc

index f4ebc0162c5e53824b788be9872eb31b3ab6ba98..54ae5e6823c85f73b070552558642e353120a5ec 100644

--- a/ui/base/layout.cc

+++ b/ui/base/layout.cc

@@ -115,9 +115,9 @@ ScopedSetSupportedScaleFactors::~ScopedSetSupportedScaleFactors() {

#if !defined(OS_MACOSX)

float GetScaleFactorForNativeView(gfx::NativeView view) {

- gfx::Screen* screen = gfx::Screen::GetScreenFor(view);

- gfx::Display display = screen->GetDisplayNearestWindow(view);

- return display.device_scale_factor();

+ return gfx::Screen::GetScreen()

+ ->GetDisplayNearestWindow(view)

+ .device_scale_factor();

}

#endif // !defined(OS_MACOSX)

« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »