Refactor the AddPakPaths to make it possible to set pak's scale factor.
This is needed when adding high DPI resources.
This commit is contained in:
parent
8d3f615e61
commit
cf1009ab30
2 changed files with 7 additions and 10 deletions
|
@ -49,13 +49,7 @@ void MainDelegate::InitializeResourceBundle() {
|
|||
#endif
|
||||
|
||||
ui::ResourceBundle::InitSharedInstanceWithPakPath(path);
|
||||
|
||||
std::vector<base::FilePath> pak_paths;
|
||||
AddPakPaths(&pak_paths);
|
||||
for (auto it = pak_paths.begin(), end = pak_paths.end(); it != end; ++it) {
|
||||
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
|
||||
*it, ui::SCALE_FACTOR_NONE);
|
||||
}
|
||||
AddDataPackFromPath(&ui::ResourceBundle::GetSharedInstance(), path.DirName());
|
||||
}
|
||||
|
||||
content::ContentBrowserClient* MainDelegate::CreateContentBrowserClient() {
|
||||
|
|
|
@ -5,8 +5,6 @@
|
|||
#ifndef BRIGHTRAY_COMMON_MAIN_DELEGATE_H_
|
||||
#define BRIGHTRAY_COMMON_MAIN_DELEGATE_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include "content/public/app/content_main_delegate.h"
|
||||
|
@ -15,6 +13,10 @@ namespace base {
|
|||
class FilePath;
|
||||
}
|
||||
|
||||
namespace ui {
|
||||
class ResourceBundle;
|
||||
}
|
||||
|
||||
namespace brightray {
|
||||
|
||||
class BrowserClient;
|
||||
|
@ -36,7 +38,8 @@ class MainDelegate : public content::ContentMainDelegate {
|
|||
|
||||
// Subclasses can override this to provide additional .pak files to be
|
||||
// included in the ui::ResourceBundle.
|
||||
virtual void AddPakPaths(std::vector<base::FilePath>* pak_paths) {}
|
||||
virtual void AddDataPackFromPath(
|
||||
ui::ResourceBundle* bundle, const base::FilePath& pak_dir) {}
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
// Subclasses can override this to custom the paths of child process and
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue