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

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, 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
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..6bd17a98fb4e91534e2d77b00947dc56710b22cf 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -51,18 +51,14 @@ 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);
// 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()) {
- 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);
}
#endif

Powered by Google App Engine
This is Rietveld 408576698