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

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc

index 9ab84df3f026497de51f43830eac879ea7c7adaf..840c345975a4aacf1e8fa790b0974167b02a4e17 100644

--- a/ui/base/resource/resource_bundle.cc

+++ b/ui/base/resource/resource_bundle.cc

@@ -621,7 +621,7 @@ void ResourceBundle::InitSharedInstance(Delegate* delegate) {

if (closest != SCALE_FACTOR_100P)

supported_scale_factors.push_back(closest);

#elif defined(OS_IOS)

- gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();

+ gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay();

if (display.device_scale_factor() > 2.0) {

DCHECK_EQ(3.0, display.device_scale_factor());

supported_scale_factors.push_back(SCALE_FACTOR_300P);

« no previous file with comments | « ui/base/layout.cc ('k') | ui/chromeos/ime/candidate_window_view.cc » ('j') | no next file with comments »