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

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

Issue 486573002: Move webkit resources over to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix GN 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 | « tools/resources/optimize-png-files.sh ('k') | webkit/glue/resources/BUILD.gn » ('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 56d16d5ed64fc45cab265597be2b4032e5da1840..6ad6b1afbdcc1d11975020dcee3d1b09576c9c9f 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -51,16 +51,17 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
nil), SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
+ 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(@"webkit_resources_200_percent",
- nil), 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 | « tools/resources/optimize-png-files.sh ('k') | webkit/glue/resources/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698