| 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);
|
|
|