| Index: ui/base/resource/resource_bundle_win.cc
|
| ===================================================================
|
| --- ui/base/resource/resource_bundle_win.cc (revision 134688)
|
| +++ ui/base/resource/resource_bundle_win.cc (working copy)
|
| @@ -45,22 +45,28 @@
|
|
|
| switch (ui::GetDisplayLayout()) {
|
| case ui::LAYOUT_TOUCH:
|
| - AddDataPack(GetResourcesPakFilePath("theme_resources_metro_1x.pak"),
|
| + AddDataPack("theme_resources_metro_1x",
|
| + GetResourcesPakFilePath("theme_resources_metro_1x.pak"),
|
| ResourceHandle::kScaleFactor100x);
|
| - AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| + AddDataPack("ui_resources_standard",
|
| + GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| ResourceHandle::kScaleFactor100x);
|
| break;
|
| default:
|
| if (use_hidpi) {
|
| - AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
|
| - ResourceHandle::kScaleFactor200x);
|
| - AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
|
| - ResourceHandle::kScaleFactor200x);
|
| + AddDataPack("theme_resources_2x",
|
| + GetResourcesPakFilePath("theme_resources_2x.pak"),
|
| + ResourceHandle::kScaleFactor200x);
|
| + AddDataPack("ui_resources_2x",
|
| + GetResourcesPakFilePath("ui_resources_2x.pak"),
|
| + ResourceHandle::kScaleFactor200x);
|
| } else {
|
| - AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
|
| - ResourceHandle::kScaleFactor100x);
|
| - AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| - ResourceHandle::kScaleFactor100x);
|
| + AddDataPack("theme_resources_standard",
|
| + GetResourcesPakFilePath("theme_resources_standard.pak"),
|
| + ResourceHandle::kScaleFactor100x);
|
| + AddDataPack("ui_resources_standard",
|
| + GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| + ResourceHandle::kScaleFactor100x);
|
| }
|
| break;
|
| }
|
|
|