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

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

Issue 10825111: Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files. (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/resource/resource_bundle_gtk.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 bafd94f0e426d42b56525fd0fe94f827b134ab47..0a3f7ffa67bc7b7de9a977b53973a9eba477b199 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -51,9 +51,7 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_100_percent",
- nil), SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_100_percent",
+ AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
nil), SCALE_FACTOR_100P);
AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
nil), SCALE_FACTOR_100P);
@@ -62,9 +60,7 @@ void ResourceBundle::LoadCommonResources() {
// On Mac we load both and let the UI framework decide which one to use.
#if defined(ENABLE_HIDPI)
if (base::mac::IsOSLionOrLater()) {
- AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_200_percent",
- nil), SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
+ AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent",
nil), SCALE_FACTOR_200P);
AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_200_percent",
nil), SCALE_FACTOR_200P);
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/resource/resource_bundle_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698