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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 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
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 8a559c4393d00d940bbc2b6c7f6bd7aa74f69eb4..07736d86116f6c23d191b5d4a07d199eabd4fe54 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -50,22 +50,22 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
void ResourceBundle::LoadCommonResources() {
AddDataPack(GetResourcesPakFilePath(@"chrome", nil),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil),
- ResourceHandle::kScaleFactor100x);
+ 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()) {
AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil),
- ResourceHandle::kScaleFactor200x);
+ SCALE_FACTOR_200P);
AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil),
- ResourceHandle::kScaleFactor200x);
+ SCALE_FACTOR_200P);
AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil),
- ResourceHandle::kScaleFactor200x);
+ SCALE_FACTOR_200P);
}
#endif
}

Powered by Google App Engine
This is Rietveld 408576698