content/browser/web_contents/web_contents_impl.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: content/browser/web_contents/web_contents_impl.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 some new gfx::Screen additions 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/window_sizer/window_sizer.cc ('K') | « content/browser/web_contents/web_contents_drag_win.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | ui/gfx/screen.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 645644f4279af87a2a3c216be1155838995cccca..d256cf867fcbf1ab4dc3bfbc7e4d48fdeea8bf7e 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -666,7 +666,8 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,

prefs.max_untiled_layer_height =

GetSwitchValueAsInt(command_line, switches::kMaxUntiledLayerHeight, 1);

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

+ // TODO(scottmg): Probably Native is wrong: http://crbug.com/133312

+ if (gfx::Screen::GetNativeScreen()->IsDIPEnabled()) {

// Only apply when using DIP coordinate system as this setting interferes

// with fixed layout mode.

prefs.apply_default_device_scale_factor_in_compositor = true;