| 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 c18a7407203f2e3635c69dfe9903e81f533210a4..4c46218b6213cb148dd6d4fe117c7c740adef756 100644
|
| --- a/ui/base/resource/resource_bundle_mac.mm
|
| +++ b/ui/base/resource/resource_bundle_mac.mm
|
| @@ -51,19 +51,19 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
|
| void ResourceBundle::LoadCommonResources() {
|
| AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
|
| SCALE_FACTOR_100P);
|
| - AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_standard", nil),
|
| - SCALE_FACTOR_100P);
|
| - AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_standard", nil),
|
| - SCALE_FACTOR_100P);
|
| + AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_100_percent",
|
| + nil), SCALE_FACTOR_100P);
|
| + AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_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_2x", nil),
|
| - SCALE_FACTOR_200P);
|
| - AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_2x", nil),
|
| - SCALE_FACTOR_200P);
|
| + AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_200_percent",
|
| + nil), SCALE_FACTOR_200P);
|
| + AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
|
| + nil), SCALE_FACTOR_200P);
|
| }
|
| #endif
|
| }
|
|
|