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

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

Issue 10701105: Update webkit_resources to support high-dpi assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change resource_bundle_mac.mm to load webkit_resources* on Mac as for other platforms Created 8 years, 5 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_aurax11.cc ('k') | ui/base/resource/resource_bundle_win.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 4c46218b6213cb148dd6d4fe117c7c740adef756..bafd94f0e426d42b56525fd0fe94f827b134ab47 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -55,6 +55,8 @@ void ResourceBundle::LoadCommonResources() {
nil), SCALE_FACTOR_100P);
AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_100_percent",
nil), SCALE_FACTOR_100P);
+ 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.
@@ -64,6 +66,8 @@ void ResourceBundle::LoadCommonResources() {
nil), SCALE_FACTOR_200P);
AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
nil), SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_200_percent",
+ nil), SCALE_FACTOR_200P);
}
#endif
}
« no previous file with comments | « ui/base/resource/resource_bundle_aurax11.cc ('k') | ui/base/resource/resource_bundle_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698