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

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

Issue 10151025: Add scale factor tag to data packs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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/resource/resource_bundle_gtk.cc ('k') | ui/base/resource/resource_bundle_unittest.cc » ('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 ee2a6ef7fddc2eb3c9b130f44fc93b60a656679d..cd894333fb703b74d48353c1f462ef4a11a0f3fb 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -44,17 +44,23 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
} // namespace
void ResourceBundle::LoadCommonResources() {
- AddDataPack(GetResourcesPakFilePath(@"chrome", nil));
- AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil));
- AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil));
+ AddDataPack(GetResourcesPakFilePath(@"chrome", nil),
+ ResourceHandle::kScaleFactor100x);
+ AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil),
+ ResourceHandle::kScaleFactor100x);
+ AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil),
+ ResourceHandle::kScaleFactor100x);
// 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));
- AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil));
- AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil));
+ AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil),
+ ResourceHandle::kScaleFactor200x);
+ AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil),
+ ResourceHandle::kScaleFactor200x);
+ AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil),
+ ResourceHandle::kScaleFactor200x);
}
#endif
}
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/resource/resource_bundle_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698