diff options
Diffstat (limited to 'www/chromium/files/patch-chrome__app__chrome_main_delegate.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome__app__chrome_main_delegate.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc index 7fdbc736cf86..9284576fdbe7 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc @@ -1,5 +1,5 @@ ---- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.cc 2014-08-22 15:06:24.000000000 +0200 @@ -96,7 +96,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -18,7 +18,7 @@ base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -245,7 +245,7 @@ +@@ -226,7 +226,7 @@ // Needed for scrollbar related images. process_type == switches::kWorkerProcess || #endif @@ -27,7 +27,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -459,7 +459,7 @@ +@@ -440,7 +440,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +36,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -500,7 +500,7 @@ +@@ -491,7 +491,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -632,7 +632,7 @@ +@@ -621,7 +621,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,30 +54,30 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -757,7 +757,7 @@ +@@ -743,7 +743,7 @@ #endif } -#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -769,7 +769,7 @@ +@@ -755,7 +755,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -854,7 +854,7 @@ +@@ -840,7 +840,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() { - #if defined(DISABLE_NACL) - return NULL; + void ChromeMainDelegate::ZygoteStarting( + ScopedVector<content::ZygoteForkDelegate>* delegates) { + #if !defined(DISABLE_NACL) |