run content scripts on linux

fixes brave/browser-laptop#743
brave · Feb 23, 2016 · e2ca3ec · e2ca3ec · bridiver · Feb 23, 2016
1 parent 5f9d258
commit e2ca3ec
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
@@ -125,6 +125,24 @@ void AtomMainDelegate::PreSandboxStartup() {
 #endif
 }
 
+#if defined(OS_LINUX)
+// Some processes are started by the zygote process on linux
+// This will probably not work with the linux sandbox enabled
+void AtomMainDelegate::ZygoteForked() {
+  auto command_line = base::CommandLine::ForCurrentProcess();
+  std::string process_type = command_line->GetSwitchValueASCII(
+      ::switches::kProcessType);
+
+  if (process_type == ::switches::kUtilityProcess) {
+    AtomContentUtilityClient::PreSandboxStartup();
+  }
+
+  if (process_type == ::switches::kRendererProcess) {
+    AtomRendererClient::PreSandboxStartup();
+  }
+}
+#endif
+
 content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new AtomBrowserClient);
   return browser_client_.get();

diff --git a/atom/app/atom_main_delegate.h b/atom/app/atom_main_delegate.h
@@ -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: