View | Details | Raw Unified | Return to bug 219188 | Differences between
and this patch

Collapse All | Expand All

(-)www/chromium/files/patch-chrome_app_chrome__main.cc (+19 lines)
Line 0 Link Here
1 
--- chrome/app/chrome_main.cc.orig	2017-05-09 19:02:41 UTC
2 
+++ chrome/app/chrome_main.cc
3 
@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar
4 
   ALLOW_UNUSED_LOCAL(command_line);
5 
 #endif
6
7 
-#if defined(OS_LINUX) || defined(OS_MACOSX)
8 
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
9 
   if (command_line->HasSwitch(switches::kHeadless)) {
10 
 #if defined(OS_MACOSX)
11 
     SetUpBundleOverrides();
12 
 #endif
13 
     return headless::HeadlessShellMain(argc, argv);
14 
   }
15 
-#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
16 
+#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
17
18 
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
19 
   version_info::Channel channel = chrome::GetChannel();
(-)www/chromium/files/patch-chrome_chrome__paks.gni (+11 lines)
Line 0 Link Here
1 
--- chrome/chrome_paks.gni.orig	2017-05-09 19:02:43 UTC
2 
+++ chrome/chrome_paks.gni
3 
@@ -157,7 +157,7 @@ template("chrome_extra_paks") {
4 
         "//ui/file_manager:resources",
5 
       ]
6 
     }
7 
-    if (is_linux) {
8 
+    if (is_linux || is_bsd) {
9 
       sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ]
10 
       deps += [ "//headless:resources" ]
11 
     }
(-)www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (+20 lines)
Line 0 Link Here
1 
--- headless/lib/browser/headless_content_browser_client.cc.orig	2017-05-09 19:02:47 UTC
2 
+++ headless/lib/browser/headless_content_browser_client.cc
3 
@@ -171,7 +171,7 @@ void HeadlessContentBrowserClient::GetQu
4 
       callback);
5 
 }
6
7 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
8 
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
9 
 void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
10 
     const base::CommandLine& command_line,
11 
     int child_process_id,
12 
@@ -182,7 +182,7 @@ void HeadlessContentBrowserClient::GetAd
13 
     mappings->Share(kCrashDumpSignal, crash_signal_fd);
14 
 #endif  // defined(HEADLESS_USE_BREAKPAD)
15 
 }
16 
-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
17 
+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
18
19 
 void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches(
20 
     base::CommandLine* command_line,
(-)www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (+11 lines)
Line 0 Link Here
1 
--- headless/lib/browser/headless_content_browser_client.h.orig	2017-05-09 19:02:47 UTC
2 
+++ headless/lib/browser/headless_content_browser_client.h
3 
@@ -28,7 +28,7 @@ class HeadlessContentBrowserClient : pub
4 
       content::BrowserContext* context,
5 
       content::StoragePartition* partition,
6 
       const storage::OptionalQuotaSettingsCallback& callback) override;
7 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
8 
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
9 
   void GetAdditionalMappedFilesForChildProcess(
10 
       const base::CommandLine& command_line,
11 
       int child_process_id,
(-)www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc (+38 lines)
Line 0 Link Here
1 
--- headless/lib/headless_content_main_delegate.cc.orig	2017-05-09 19:02:47 UTC
2 
+++ headless/lib/headless_content_main_delegate.cc
3 
@@ -147,7 +147,7 @@ void HeadlessContentMainDelegate::InitCr
4 
   g_headless_crash_client.Pointer()->set_crash_dumps_dir(
5 
       browser_->options()->crash_dumps_dir);
6
7 
-#if !defined(OS_MACOSX)
8 
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
9 
   if (!browser_->options()->enable_crash_reporter) {
10 
     DCHECK(!breakpad::IsCrashReporterEnabled());
11 
     return;
12 
@@ -156,7 +156,7 @@ void HeadlessContentMainDelegate::InitCr
13 
   if (process_type != switches::kZygoteProcess)
14 
     breakpad::InitCrashReporter(process_type);
15 
 #endif  // defined(HEADLESS_USE_BREAKPAD)
16 
-#endif  // !defined(OS_MACOSX)
17 
+#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
18 
 }
19
20 
 void HeadlessContentMainDelegate::PreSandboxStartup() {
21 
@@ -170,7 +170,7 @@ void HeadlessContentMainDelegate::PreSan
22 
   if (command_line.HasSwitch(switches::kEnableLogging))
23 
     InitLogging(command_line);
24 
 #endif
25 
-#if !defined(OS_MACOSX)
26 
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
27 
   InitCrashReporter(command_line);
28 
 #endif
29 
   InitializeResourceBundle();
30 
@@ -202,7 +202,7 @@ int HeadlessContentMainDelegate::RunProc
31 
   return 0;
32 
 }
33
34 
-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
35 
+#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
36 
 void HeadlessContentMainDelegate::ZygoteForked() {
37 
   const base::CommandLine& command_line(
38 
       *base::CommandLine::ForCurrentProcess());
(-)www/chromium/files/patch-headless_lib_headless__content__main__delegate.h (+11 lines)
Line 0 Link Here
1 
--- headless/lib/headless_content_main_delegate.h.orig	2017-05-09 19:02:47 UTC
2 
+++ headless/lib/headless_content_main_delegate.h
3 
@@ -39,7 +39,7 @@ class HeadlessContentMainDelegate : publ
4
5 
   HeadlessBrowserImpl* browser() const { return browser_.get(); }
6
7 
-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
8 
+#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
9 
   void ZygoteForked() override;
10 
 #endif
11
(-)www/chromium/files/patch-headless_lib_headless__macros.h (+13 lines)
Line 0 Link Here
1 
--- headless/lib/headless_macros.h.orig	2017-05-09 19:02:47 UTC
2 
+++ headless/lib/headless_macros.h
3 
@@ -5,8 +5,8 @@
4 
 #ifndef HEADLESS_LIB_HEADLESS_MACROS_H_
5 
 #define HEADLESS_LIB_HEADLESS_MACROS_H_
6
7 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
8 
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
9 
 #define HEADLESS_USE_BREAKPAD
10 
-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
11 
+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
12
13 
 #endif  // HEADLESS_LIB_HEADLESS_MACROS_H_

Return to bug 219188