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 | 41 |
1 files changed, 25 insertions, 16 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 1d6ebedc2eed..8c6e2f545b68 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc @@ -1,15 +1,15 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2013-11-08 07:41:27.000000000 +0100 -+++ chrome/app/chrome_main_delegate.cc 2013-11-16 11:29:59.000000000 +0100 -@@ -96,7 +96,7 @@ +--- chrome/app/chrome_main_delegate.cc.orig 2014-01-07 21:01:39.000000000 +0100 ++++ chrome/app/chrome_main_delegate.cc 2014-01-13 16:53:27.000000000 +0100 +@@ -97,7 +97,7 @@ #include "ui/base/x/x11_util.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #include "chrome/app/breakpad_linux.h" + #include "components/breakpad/app/breakpad_linux.h" #endif -@@ -114,7 +114,7 @@ +@@ -115,7 +115,7 @@ g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; #endif @@ -18,7 +18,7 @@ base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -234,7 +234,7 @@ +@@ -235,7 +235,7 @@ // Mac needs them for the plugin process name. process_type == switches::kPluginProcess || #endif @@ -27,7 +27,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -391,7 +391,7 @@ +@@ -392,7 +392,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 { -@@ -432,7 +432,7 @@ +@@ -433,7 +433,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 { -@@ -563,7 +563,7 @@ +@@ -564,7 +564,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,16 +54,25 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -700,7 +700,7 @@ +@@ -701,7 +701,7 @@ #endif } -#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain - // sets this up for the browser process in a different manner. Zygotes - // need to call InitCrashReporter() in RunZygote(). -@@ -813,7 +813,7 @@ ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) + // Zygote needs to call InitCrashReporter() in RunZygote(). + if (process_type != switches::kZygoteProcess) { + #if defined(OS_ANDROID) +@@ -713,7 +713,7 @@ + breakpad::InitCrashReporter(); + #endif // defined(OS_ANDROID) + } +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) + + // After all the platform Breakpads have been initialized, store the command + // line for crash reporting. +@@ -814,7 +814,7 @@ SetUpProfilingShutdownHandler(); } @@ -71,4 +80,4 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets // this up for the browser process in a different manner. - InitCrashReporter(); + breakpad::InitCrashReporter(); |