| Index: ui/base/resource/resource_bundle_win.cc
|
| diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
|
| index 4e525e7bf5d4fc3b536d17063a753f9cb274c395..7ef486a979e123b99a4b847273a705d106e28d87 100644
|
| --- a/ui/base/resource/resource_bundle_win.cc
|
| +++ b/ui/base/resource/resource_bundle_win.cc
|
| @@ -48,22 +48,26 @@ void ResourceBundle::LoadCommonResources() {
|
|
|
| switch (ui::GetDisplayLayout()) {
|
| case ui::LAYOUT_TOUCH:
|
| - AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
|
| - SCALE_FACTOR_100P);
|
| - AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| - SCALE_FACTOR_100P);
|
| + AddDataPackFromPath(
|
| + GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
|
| + SCALE_FACTOR_100P);
|
| + AddDataPackFromPath(
|
| + GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| + SCALE_FACTOR_100P);
|
| break;
|
| default:
|
| if (use_hidpi) {
|
| - AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
|
| - SCALE_FACTOR_200P);
|
| - AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
|
| - SCALE_FACTOR_200P);
|
| + AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
|
| + SCALE_FACTOR_200P);
|
| + AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
|
| + SCALE_FACTOR_200P);
|
| } else {
|
| - AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
|
| - SCALE_FACTOR_100P);
|
| - AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| - SCALE_FACTOR_100P);
|
| + AddDataPackFromPath(
|
| + GetResourcesPakFilePath("theme_resources_standard.pak"),
|
| + SCALE_FACTOR_100P);
|
| + AddDataPackFromPath(
|
| + GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| + SCALE_FACTOR_100P);
|
| }
|
| break;
|
| }
|
|
|