Index: headless/lib/headless_content_main_delegate.cc |
diff --git a/headless/lib/headless_content_main_delegate.cc b/headless/lib/headless_content_main_delegate.cc |
index 067ef27193dd9feb922c84c636bb7d6393778e3e..03e4b08aeb866e132645c3e7c5b07e679d6a0faa 100644 |
--- a/headless/lib/headless_content_main_delegate.cc |
+++ b/headless/lib/headless_content_main_delegate.cc |
@@ -22,7 +22,6 @@ |
#include "headless/lib/browser/headless_content_browser_client.h" |
#include "headless/lib/headless_crash_reporter_client.h" |
#include "headless/lib/headless_macros.h" |
-#include "headless/lib/renderer/headless_content_renderer_client.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/ui_base_switches.h" |
#include "ui/gfx/switches.h" |
@@ -31,6 +30,10 @@ |
#ifdef HEADLESS_USE_EMBEDDED_RESOURCES |
#include "headless/embedded_resource_pak.h" |
+#endif |
+ |
+#if !defined(CHROME_MULTIPLE_DLL_BROWSER) |
+#include "headless/lib/renderer/headless_content_renderer_client.h" |
#endif |
namespace headless { |
@@ -159,7 +162,7 @@ |
g_headless_crash_client.Pointer()->set_crash_dumps_dir( |
browser_->options()->crash_dumps_dir); |
-#if !defined(OS_MACOSX) |
+#if defined(OS_LINUX) |
if (!browser_->options()->enable_crash_reporter) { |
DCHECK(!breakpad::IsCrashReporterEnabled()); |
return; |
@@ -168,7 +171,7 @@ |
if (process_type != switches::kZygoteProcess) |
breakpad::InitCrashReporter(process_type); |
#endif // defined(HEADLESS_USE_BREAKPAD) |
-#endif // !defined(OS_MACOSX) |
+#endif // !defined(OS_LINUX) |
} |
void HeadlessContentMainDelegate::PreSandboxStartup() { |
@@ -272,15 +275,23 @@ |
content::ContentBrowserClient* |
HeadlessContentMainDelegate::CreateContentBrowserClient() { |
+#if defined(CHROME_MULTIPLE_DLL_CHILD) |
+ return nullptr; |
+#else |
browser_client_ = |
base::MakeUnique<HeadlessContentBrowserClient>(browser_.get()); |
return browser_client_.get(); |
+#endif |
} |
content::ContentRendererClient* |
HeadlessContentMainDelegate::CreateContentRendererClient() { |
+#if defined(CHROME_MULTIPLE_DLL_BROWSER) |
+ return nullptr; |
+#else |
renderer_client_ = base::MakeUnique<HeadlessContentRendererClient>(); |
return renderer_client_.get(); |
+#endif |
} |
} // namespace headless |