ui/base/resource/resource_bundle.cc - Issue 574663003: Enables 300P support for iOS.

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 574663003: Enables 300P support for iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: IWYU. Created 6 years, 3 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 ea47d0e486ad9a00de507e87044f230465eae781..b19133a5fd254ec3cb6239388d08ef68913ba0c8 100644

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

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

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

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

if (display.device_scale_factor() > 2.0) {

DCHECK_EQ(3.0, display.device_scale_factor());

- // TODO(lliabraa): Add 3x images instead of using 2x on 3x screens.

- // crbug.com/413300

- supported_scale_factors.push_back(SCALE_FACTOR_200P);

+ supported_scale_factors.push_back(SCALE_FACTOR_300P);

} else if (display.device_scale_factor() > 1.0) {

DCHECK_EQ(2.0, display.device_scale_factor());

supported_scale_factors.push_back(SCALE_FACTOR_200P);