diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2013-11-18 16:02:34 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2013-11-18 16:02:34 +0000 |
| commit | f7618461acd6681bafee22ce69f6dcf2faa710e7 (patch) | |
| tree | 3f9b3266904ba5da0859253d07da278055376307 /www/chromium/files/patch-chrome__app__chrome_main_delegate.cc | |
| parent | Second run a removing EOLed lua 5.0 (diff) | |
Update to 31.0.1650.57
This release has some patches merged back upstream, thanks to George Liaskos.
Security: http://vuxml.org/freebsd/3bfc7016-4bcc-11e3-b0cf-00262d5ed8ee.html
Security: http://vuxml.org/freebsd/e62ab2af-4df4-11e3-b0cf-00262d5ed8ee.html
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 | 34 |
1 files changed, 26 insertions, 8 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 4a461fd8a83c..1d6ebedc2eed 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2013-09-20 05:35:27.000000000 +0300 -+++ chrome/app/chrome_main_delegate.cc 2013-09-25 21:42:44.000000000 +0300 -@@ -92,7 +92,7 @@ +--- 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 @@ #include "ui/base/x/x11_util.h" #endif @@ -9,7 +9,7 @@ #include "chrome/app/breakpad_linux.h" #endif -@@ -110,7 +110,7 @@ +@@ -114,7 +114,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 -@@ -230,7 +230,7 @@ +@@ -234,7 +234,7 @@ // Mac needs them for the plugin process name. process_type == switches::kPluginProcess || #endif @@ -27,7 +27,25 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -573,7 +573,7 @@ +@@ -391,7 +391,7 @@ + std::string format_str = + command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); + if (format_str == "machine") { +- format = diagnostics::DiagnosticsWriter::MACHINE; ++ format = diagnostics::DiagnosticsWriter::THEMACHINE; + } else if (format_str == "log") { + format = diagnostics::DiagnosticsWriter::LOG; + } else { +@@ -432,7 +432,7 @@ + std::string format_str = + command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); + if (format_str == "machine") { +- format = diagnostics::DiagnosticsWriter::MACHINE; ++ format = diagnostics::DiagnosticsWriter::THEMACHINE; + } else if (format_str == "human") { + format = diagnostics::DiagnosticsWriter::HUMAN; + } else { +@@ -563,7 +563,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -36,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -699,7 +699,7 @@ +@@ -700,7 +700,7 @@ #endif } @@ -45,7 +63,7 @@ // 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(). -@@ -811,7 +811,7 @@ +@@ -813,7 +813,7 @@ SetUpProfilingShutdownHandler(); } |