| Index: ui/base/resource/resource_bundle_aurax11.cc
|
| diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
|
| index bdb6fcc3641ff95e518af9245864ca81f1e56353..f443e5775706738d9fee8b74cf5e048aef9ec88c 100644
|
| --- a/ui/base/resource/resource_bundle_aurax11.cc
|
| +++ b/ui/base/resource/resource_bundle_aurax11.cc
|
| @@ -44,29 +44,36 @@ void ResourceBundle::LoadCommonResources() {
|
|
|
| if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
|
| // 1x touch
|
| - AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
|
| + AddDataPackFromPath(GetResourcesPakFilePath(
|
| + "theme_resources_touch_100_percent.pak"),
|
| SCALE_FACTOR_100P);
|
| - AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch.pak"),
|
| + AddDataPackFromPath(GetResourcesPakFilePath(
|
| + "ui_resources_touch_100_percent.pak"),
|
| SCALE_FACTOR_100P);
|
| if (ShouldLoad2xResources()) {
|
| // 2x touch
|
| AddDataPackFromPath(
|
| - GetResourcesPakFilePath("theme_resources_touch_2x.pak"),
|
| + GetResourcesPakFilePath("theme_resources_touch_200_percent.pak"),
|
| SCALE_FACTOR_200P);
|
| - AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch_2x.pak"),
|
| + AddDataPackFromPath(GetResourcesPakFilePath(
|
| + "ui_resources_touch_200_percent.pak"),
|
| SCALE_FACTOR_200P);
|
| }
|
| } else {
|
| // 1x non touch
|
| - AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
|
| + AddDataPackFromPath(GetResourcesPakFilePath(
|
| + "theme_resources_100_percent.pak"),
|
| SCALE_FACTOR_100P);
|
| - AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| + AddDataPackFromPath(GetResourcesPakFilePath(
|
| + "ui_resources_100_percent.pak"),
|
| SCALE_FACTOR_100P);
|
| if (ShouldLoad2xResources()) {
|
| // 2x non touch
|
| - AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
|
| + AddDataPackFromPath(GetResourcesPakFilePath(
|
| + "theme_resources_200_percent.pak"),
|
| SCALE_FACTOR_200P);
|
| - AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
|
| + AddDataPackFromPath(GetResourcesPakFilePath(
|
| + "ui_resources_200_percent.pak"),
|
| SCALE_FACTOR_200P);
|
| }
|
| }
|
|
|