ui/base/layout.cc - Issue 11293147: Always add 100P scale format in the supported format list.

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 11293147: Always add 100P scale format in the supported format list. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 1 month 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 6fef499542c57632fb6afc58a7d821309ce5d193..7b941861ab24aa33121861abb4ef819112cc53a9 100644

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

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

@@ -73,18 +73,14 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() {

static std::vector<ScaleFactor>* supported_scale_factors =

new std::vector<ScaleFactor>();

if (supported_scale_factors->empty()) {

-#if !defined(OS_IOS)

- // On platforms other than iOS, 100P is always a supported scale factor.

+ // 100P is always a supported scale factor.

Nico 2012/11/09 19:16:37 Explain why this is enabled on iOS, which technica

supported_scale_factors->push_back(SCALE_FACTOR_100P);

-#endif

#if defined(OS_IOS)

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

if (display.device_scale_factor() > 1.0) {

DCHECK_EQ(2.0, display.device_scale_factor());

supported_scale_factors->push_back(SCALE_FACTOR_200P);

- } else {

- supported_scale_factors->push_back(SCALE_FACTOR_100P);

}

#elif defined(OS_MACOSX)

if (base::mac::IsOSLionOrLater())

« no previous file with comments | « no previous file | ui/base/resource/resource_bundle_ios.mm » ('j') | no next file with comments »