mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Initialize resource bundle on browser process separately

Browse source
This commit is contained in:
Cheng Zhao 2016-01-08 12:04:23 +08:00
parent 2374149b18
commit d6051e9580
5 changed files with 81 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

11
brightray/common/main_delegate.h
View file

@ -22,6 +22,9 @@ namespace brightray {
class BrowserClient;
class ContentClient;
void InitializeResourceBundle(const std::string& locale);
base::FilePath GetResourcesPakFilePath();
class MainDelegate : public content::ContentMainDelegate {
public:
MainDelegate();
@ -36,15 +39,9 @@ class MainDelegate : public content::ContentMainDelegate {
// implementation.
virtual scoped_ptr<BrowserClient> CreateBrowserClient();
// Subclasses can override this to provide additional .pak files to be
// included in the ui::ResourceBundle.
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
// framework bundle.
virtual base::FilePath GetResourcesPakFilePath();
virtual void OverrideChildProcessPath();
virtual void OverrideFrameworkBundlePath();
#endif
@ -55,8 +52,6 @@ class MainDelegate : public content::ContentMainDelegate {
private:
content::ContentBrowserClient* CreateContentBrowserClient() override;
void InitializeResourceBundle();
scoped_ptr<ContentClient> content_client_;
scoped_ptr<BrowserClient> browser_client_;