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

Unified Diff: ui/base/resource/resource_bundle_mac.mm

Issue 10828052: Makes ui::GetSupportedScaleFactors available on platforms other than Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/layout_mac.mm ('k') | ui/gfx/image/image_unittest_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_mac.mm
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index 0a3f7ffa67bc7b7de9a977b53973a9eba477b199..afaa47a878752f68d03d4cebed131ddc5562b28b 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -56,16 +56,14 @@ void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
nil), SCALE_FACTOR_100P);
- // On Windows and ChromeOS we load either the 1x resource or the 2x resource.
- // On Mac we load both and let the UI framework decide which one to use.
-#if defined(ENABLE_HIDPI)
- if (base::mac::IsOSLionOrLater()) {
+ // On Mac we load 1x and 2x resources and we let the UI framework decide
+ // which one to use.
+ if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent",
nil), SCALE_FACTOR_200P);
AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_200_percent",
nil), SCALE_FACTOR_200P);
}
-#endif
}
FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
« no previous file with comments | « ui/base/layout_mac.mm ('k') | ui/gfx/image/image_unittest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698