| 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 ec6678d23ace907cede9fcacecece07931fd6d7b..5c8d598d71d6e0a1bf1b5f27d103253966d0a03d 100644
|
| --- a/ui/base/resource/resource_bundle_linux.cc
|
| +++ b/ui/base/resource/resource_bundle_linux.cc
|
| @@ -7,12 +7,23 @@
|
| #include "base/path_service.h"
|
| #include "ui/base/ui_base_paths.h"
|
|
|
| +namespace {
|
| +
|
| +FilePath GetResourcesPakFilePath(const std::string& pak_name) {
|
| + FilePath path;
|
| + if (PathService::Get(base::DIR_MODULE, &path))
|
| + return path.AppendASCII(pak_name.c_str());
|
| + return FilePath();
|
| +}
|
| +
|
| +} // namespace
|
| +
|
| namespace ui {
|
|
|
| void ResourceBundle::LoadCommonResources() {
|
| - FilePath path;
|
| - PathService::Get(ui::FILE_RESOURCES_PAK, &path);
|
| - AddDataPack(path);
|
| + AddDataPack(GetResourcesPakFilePath("chrome.pak"));
|
| + AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
|
| + AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
|
| }
|
|
|
| } // namespace ui
|
|
|