diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-06-07 20:28:41 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-06-07 20:28:41 +0000 |
| commit | 45d3cc73dc908af3262c6a714cb755edd03f071a (patch) | |
| tree | 564e40b2ccfe669385077be2c94de93ac0c15fe3 /www/chromium/files/patch-chrome_browser_chrome__browser__main.cc | |
| parent | Update to 6.0p1. Notable fixes: (diff) | |
www/chromium: update to 51.0.2704.84
A lot of patch files are renamed in this update.
Submitted by: Timothy Vaccarelli
Obtained from: https://github.com/LeFroid/
MFH: 2016Q2
Security: http://vuxml.freebsd.org/freebsd/c039a761-2c29-11e6-8912-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/1a6bbb95-24b8-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/4dfafa16-24ba-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/7da1da96-24bb-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/6d8505f0-0614-11e6-b39c-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_chrome__browser__main.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_chrome__browser__main.cc | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc new file mode 100644 index 000000000000..e19f5899e35b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -0,0 +1,25 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2016-05-25 15:00:57.000000000 -0400 ++++ chrome/browser/chrome_browser_main.cc 2016-05-27 09:43:16.154885000 -0400 +@@ -173,7 +173,7 @@ + #include "chrome/browser/feedback/feedback_profile_observer.h" + #endif // defined(OS_ANDROID) + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "chrome/browser/first_run/upgrade_util_linux.h" + #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) + +@@ -1109,11 +1109,11 @@ + } + #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Set the product channel for crash reports. + base::debug::SetCrashKeyValue(crash_keys::kChannel, + chrome::GetChannelString()); +-#endif // defined(OS_LINUX) || defined(OS_OPENBSD) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // Initialize tracking synchronizer system. + tracking_synchronizer_ = new metrics::TrackingSynchronizer( |