diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 06:55:14 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 06:55:14 +0000 |
| commit | 347e2bc55f9baf2b44a6b265c5ce110d2ed4b9b8 (patch) | |
| tree | 9225b2ce830d701121dcc56dc30db0eb6bf6af71 /www/chromium/files/patch-chrome__app__chrome_main_delegate.cc | |
| parent | - Upgrade to 0.010002. (diff) | |
www/chromium: update to 39.0.2171.65
MFH: 2014Q4
Security: d395e44f-6f4f-11e4-a444-00262d5ed8ee
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 | 38 |
1 files changed, 10 insertions, 28 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 3d2bbaf96774..91ff873223a0 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc @@ -1,33 +1,15 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -94,7 +94,7 @@ +@@ -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 "components/breakpad/app/breakpad_linux.h" + #include "components/crash/app/breakpad_linux.h" #endif -@@ -124,7 +124,7 @@ - g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; - #endif - --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky - g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; - #endif -@@ -225,7 +225,7 @@ - // Mac needs them for the plugin process name. - process_type == switches::kPluginProcess || - #endif --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // The zygote process opens the resources for the renderers. - process_type == switches::kZygoteProcess || - #endif -@@ -441,7 +441,7 @@ +@@ -449,7 +449,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +18,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -492,7 +492,7 @@ +@@ -500,7 +500,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,16 +27,16 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -632,7 +632,7 @@ +@@ -640,7 +640,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) - breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); + crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -759,7 +759,7 @@ +@@ -767,7 +767,7 @@ #endif } @@ -63,7 +45,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -771,7 +771,7 @@ +@@ -779,7 +779,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +54,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -863,7 +863,7 @@ +@@ -875,7 +875,7 @@ #endif return process_type == switches::kRelauncherProcess; } |