ui/base/resource/resource_bundle.cc - Issue 1917973002: mac: Remove IsOSLion().

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 1917973002: mac: Remove IsOSLion(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 8 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 54ff7eadf369f03340c8c42999e36ea91d0ce501..1fba3096be5a1b926d4a25882b19f68781a73d4b 100644

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

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

@@ -671,10 +671,8 @@ void ResourceBundle::InitSharedInstance(Delegate* delegate) {

} else {

supported_scale_factors.push_back(SCALE_FACTOR_100P);

}

-#elif defined(OS_MACOSX)

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

- supported_scale_factors.push_back(SCALE_FACTOR_200P);

-#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)

+#elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \

+ defined(OS_WIN)

supported_scale_factors.push_back(SCALE_FACTOR_200P);

#endif

ui::SetSupportedScaleFactors(supported_scale_factors);