Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(709)

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: tapted 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/cocoa/base_view.mm ('k') | ui/gfx/font_fallback_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..87ec2fc3f0dff3bfa949461af658ba6a6a4921f9 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -55,10 +55,6 @@
#include "ui/display/win/dpi.h"
#endif
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-#include "base/mac/mac_util.h"
-#endif
-
namespace ui {
namespace {
@@ -671,10 +667,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);
« no previous file with comments | « ui/base/cocoa/base_view.mm ('k') | ui/gfx/font_fallback_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698