diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-07-22 10:28:49 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-07-22 10:28:49 +0000 |
| commit | 87e53bd8784b27458612f0542b614bc9aa0bb1fd (patch) | |
| tree | 029b1a5de0832499b90c4e4c54ec7bbff32684c1 /www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc | |
| parent | 9f307bc6e46cccde72b329525602276a60284155 (diff) | |
| download | ports-87e53bd8784b27458612f0542b614bc9aa0bb1fd.tar.gz ports-87e53bd8784b27458612f0542b614bc9aa0bb1fd.zip | |
www/chromium: update to 67.0.3396.87
Changelog: https://chromium.googlesource.com/chromium/src/+log/65.0.3325.181..67.0.3396.87?pretty=fuller&n=10000
MFH: 2018Q3
Security: https://vuxml.freebsd.org/freebsd/36ff7a74-47b1-11e8-a7d6-54e1ad544088.html
Security: https://vuxml.freebsd.org/freebsd/006bee4e-4c49-11e8-9c32-54ee754af08e.html
Security: https://vuxml.freebsd.org/freebsd/e457978b-5484-11e8-9b85-54ee754af08e.html
Security: https://vuxml.freebsd.org/freebsd/427b0f58-644c-11e8-9e1b-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/4cb49a23-6c89-11e8-8b33-e8e0b747a45a.html
Notes
Notes:
svn path=/head/; revision=475101
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 | 24 |
1 files changed, 12 insertions, 12 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 index f2e640f9788f..4e67be0738ae 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2018-02-24 16:25:09.000000000 +0100 -+++ chrome/browser/chrome_content_browser_client.cc 2018-03-03 20:34:31.799512000 +0100 -@@ -281,7 +281,7 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/chrome_content_browser_client.cc 2018-07-14 14:04:47.872292000 +0200 +@@ -305,7 +305,7 @@ #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.h" - #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h" + #include "services/service_manager/public/mojom/interface_provider_spec.mojom.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 "base/android/application_status_listener.h" -@@ -316,7 +316,7 @@ +@@ -342,7 +342,7 @@ #include "chrome/common/importer/profile_import.mojom.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/webshare/share_service_impl.h" #endif -@@ -330,7 +330,7 @@ +@@ -356,7 +356,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -912,7 +912,7 @@ +@@ -1033,7 +1033,7 @@ main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -36,7 +36,7 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -928,7 +928,7 @@ +@@ -1049,7 +1049,7 @@ // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -45,7 +45,7 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1651,7 +1651,7 @@ +@@ -1789,7 +1789,7 @@ command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -54,7 +54,7 @@ bool enable_crash_reporter = breakpad::IsCrashReporterEnabled(); #if defined(OS_CHROMEOS) // Chrome OS uses the OS-level crash_reporter for mash services, so disable -@@ -2913,7 +2913,7 @@ +@@ -3096,7 +3096,7 @@ } } @@ -63,7 +63,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -2949,7 +2949,7 @@ +@@ -3132,7 +3132,7 @@ } #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ #if defined(OS_WIN) base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -3630,7 +3630,7 @@ +@@ -3806,7 +3806,7 @@ #if defined(OS_ANDROID) frame_interfaces_parameterized_->AddInterface(base::Bind( &ForwardToJavaWebContentsRegistry<blink::mojom::ShareService>)); |