| Index: ui/base/resource/resource_bundle_linux.cc
|
| diff --git a/ui/base/resource/resource_bundle_linux.cc b/ui/base/resource/resource_bundle_linux.cc
|
| index 5c8d598d71d6e0a1bf1b5f27d103253966d0a03d..90e64399839723fe4b44a603158d27e370524960 100644
|
| --- a/ui/base/resource/resource_bundle_linux.cc
|
| +++ b/ui/base/resource/resource_bundle_linux.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| #include "base/path_service.h"
|
| +#include "ui/base/resource/resource_handle.h"
|
| #include "ui/base/ui_base_paths.h"
|
|
|
| namespace {
|
| @@ -21,9 +22,19 @@ FilePath GetResourcesPakFilePath(const std::string& pak_name) {
|
| namespace ui {
|
|
|
| void ResourceBundle::LoadCommonResources() {
|
| - AddDataPack(GetResourcesPakFilePath("chrome.pak"));
|
| - AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
|
| - AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
|
| + AddDataPack(GetResourcesPakFilePath("chrome.pak"),
|
| + ResourceHandle::kScaleFactor1x);
|
| + AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
|
| + ResourceHandle::kScaleFactor1x);
|
| + AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
|
| + ResourceHandle::kScaleFactor1x);
|
| +
|
| +#if defined(ENABLE_HIDPI)
|
| + AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
|
| + ResourceHandle::kScaleFactor2x);
|
| + AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
|
| + ResourceHandle::kScaleFactor2x);
|
| +#endif
|
| }
|
|
|
| } // namespace ui
|
|
|