Skip to content
This repository was archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
run content scripts on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
bridiver committed Feb 23, 2016
1 parent 2566731 commit efd2bdd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
9 changes: 9 additions & 0 deletions atom/app/atom_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,15 @@ void AtomMainDelegate::PreSandboxStartup() {
#endif
}

#if defined(OS_LINUX)
// renderer is started by the zygote process on linux
// this may or may not work correctly when the with
// the linux sandbox enabled
void AtomMainDelegate::ZygoteForked() {
AtomRendererClient::PreSandboxStartup();
}
#endif

content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
browser_client_.reset(new AtomBrowserClient);
return browser_client_.get();
Expand Down
2 changes: 2 additions & 0 deletions atom/app/atom_main_delegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class AtomMainDelegate : public brightray::MainDelegate {
#if defined(OS_MACOSX)
void OverrideChildProcessPath() override;
void OverrideFrameworkBundlePath() override;
#elif defined(OS_LINUX)
void ZygoteForked() override;
#endif

private:
Expand Down

0 comments on commit efd2bdd

Please sign in to comment.