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__content__browser__client.cc | |
parent | 071c1e89c17887adb174a6933a8f241ac326e143 (diff) | |
download | ports-45d3cc73dc908af3262c6a714cb755edd03f071a.tar.gz ports-45d3cc73dc908af3262c6a714cb755edd03f071a.zip |
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
Notes
Notes:
svn path=/head/; revision=416521
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc')
-rw-r--r-- | www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc new file mode 100644 index 000000000000..617b605ad503 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -0,0 +1,74 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2016-05-11 19:02:13 UTC ++++ chrome/browser/chrome_content_browser_client.cc +@@ -191,7 +191,7 @@ + #include "chrome/browser/chromeos/system/input_device_settings.h" + #include "chromeos/chromeos_switches.h" + #include "components/user_manager/user_manager.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/chrome_browser_main_linux.h" + #elif defined(OS_ANDROID) + #include "chrome/browser/chrome_browser_main_android.h" +@@ -204,7 +204,7 @@ + #include "chrome/browser/chrome_browser_main_posix.h" + #endif + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + #include "base/debug/leak_annotations.h" + #include "components/crash/content/app/breakpad_linux.h" + #include "components/crash/content/browser/crash_handler_host_linux.h" +@@ -225,7 +225,7 @@ + #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" + #endif + +@@ -502,7 +502,7 @@ bool CertMatchesFilter(const net::X509Ce + return false; + } + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( + const std::string& process_type) { + base::FilePath dumps_path; +@@ -782,7 +782,7 @@ content::BrowserMainParts* ChromeContent + main_parts = new ChromeBrowserMainPartsMac(parameters); + #elif defined(OS_CHROMEOS) + main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + main_parts = new ChromeBrowserMainPartsLinux(parameters); + #elif defined(OS_ANDROID) + main_parts = new ChromeBrowserMainPartsAndroid(parameters); +@@ -798,7 +798,7 @@ content::BrowserMainParts* ChromeContent + // Construct additional browser parts. Stages are called in the order in + // which they are added. + #if defined(TOOLKIT_VIEWS) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); + #else + main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); +@@ -1428,7 +1428,7 @@ void ChromeContentBrowserClient::AppendE + command_line->AppendSwitchASCII(switches::kMetricsClientID, + client_info->client_id); + } +-#elif defined(OS_POSIX) ++#elif defined(OS_POSIX) && !defined(OS_BSD) + if (breakpad::IsCrashReporterEnabled()) { + std::string switch_value; + scoped_ptr<metrics::ClientInfo> client_info = +@@ -2637,7 +2637,7 @@ void ChromeContentBrowserClient::GetAddi + PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path); + DCHECK(!app_data_path.empty()); + } +-#elif defined(OS_POSIX) && !defined(OS_MACOSX) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( + const base::CommandLine& command_line, + int child_process_id, |