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

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

Issue 521473002: ui: No need to add content resources paks in ResourceBundle Mac port. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | no next file » | 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 6ad6b1afbdcc1d11975020dcee3d1b09576c9c9f..2863e087d059aab8f11a7bd0440bd35ff551dac4 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -51,17 +51,12 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
nil), SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"content_resources_100_percent",
- nil), SCALE_FACTOR_100P);
// On Mac we load 1x and 2x resources and we let the UI framework decide
// which one to use.
if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent", nil),
SCALE_FACTOR_200P);
- AddDataPackFromPath(
- GetResourcesPakFilePath(@"content_resources_200_percent", nil),
- SCALE_FACTOR_200P);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698