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

Index: ui/base/layout.cc

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

index b496fb7ee87386766607147563e64c354b73c6e7..3d2538000ea97215e3aad2446d4dae9ac2779231 100644

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

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

@@ -151,8 +151,9 @@ void SetSupportedScaleFactors(

#if !defined(OS_MACOSX)

ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view) {

- if (gfx::Screen::IsDIPEnabled()) {

- gfx::Display display = gfx::Screen::GetDisplayNearestWindow(view);

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

+ if (screen->IsDIPEnabled()) {

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

return GetScaleFactorFromScale(display.device_scale_factor());

}

return ui::SCALE_FACTOR_100P;

« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/gfx/screen.h » ('j') | no next file with comments »