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

refactor: eliminate brightray::MainDelegate (#15333)

Browse source
This commit is contained in:
Milan Burda 2018-10-23 14:16:13 +02:00 • committed by Alexey Kuzmin
parent fbbb704146
commit 809bd3757b
7 changed files with 77 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/app/atom_main_delegate.h
View file

@ -8,12 +8,14 @@
#include <memory>
#include <string>
#include "brightray/common/main_delegate.h"
#include "content/public/app/content_main_delegate.h"
#include "content/public/common/content_client.h"
namespace atom {
class AtomMainDelegate : public brightray::MainDelegate {
void LoadResourceBundle(const std::string& locale);
class AtomMainDelegate : public content::ContentMainDelegate {
public:
AtomMainDelegate();
~AtomMainDelegate() override;
@ -34,14 +36,10 @@ class AtomMainDelegate : public brightray::MainDelegate {
bool DelaySandboxInitialization(const std::string& process_type) override;
#endif
// brightray::MainDelegate:
#if defined(OS_MACOSX)
void OverrideChildProcessPath() override;
void OverrideFrameworkBundlePath() override;
#endif
private:
#if defined(OS_MACOSX)
void OverrideChildProcessPath();
void OverrideFrameworkBundlePath();
void SetUpBundleOverrides();
#endif