diff options
author | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
commit | 2dd4dd29c063a32031fb5549616ba28e76310f0a (patch) | |
tree | 0427b26fe2d2bae71ff47102b5e646fdf927c022 /www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc | |
parent | b18acf6f2cf8fce61ca3d5f1d5c3be5f62b810e7 (diff) | |
download | ports-2dd4dd29c063a32031fb5549616ba28e76310f0a.tar.gz ports-2dd4dd29c063a32031fb5549616ba28e76310f0a.zip |
www/chromium: update to 84.0.4147.105
Submitted by: Matthias Wolf via GitHub
MFH: 2020Q3
Security: http://vuxml.freebsd.org/freebsd/9a447f78-d0f8-11ea-9837-e09467587c17.html
Security: http://vuxml.freebsd.org/freebsd/870d59b0-c6c4-11ea-8015-e09467587c17.html
Notes
Notes:
svn path=/head/; revision=543833
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 | 34 |
1 files changed, 17 insertions, 17 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 0eed600fa6d3..f4725b2779ae 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,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -396,7 +396,7 @@ +@@ -407,7 +407,7 @@ #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -450,12 +450,12 @@ +@@ -460,12 +460,12 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -483,7 +483,7 @@ +@@ -493,7 +493,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -33,7 +33,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -789,11 +789,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -801,11 +801,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -47,7 +47,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1230,7 +1232,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1311,7 +1313,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( parameters, startup_data_); @@ -56,7 +56,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1256,7 +1258,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1337,7 +1339,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -65,7 +65,7 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1979,7 +1981,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2082,7 +2084,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -74,7 +74,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2256,7 +2258,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2377,7 +2379,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( process_type, command_line); @@ -83,7 +83,7 @@ // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(service_manager::switches::kNoSandbox)) { -@@ -3546,7 +3548,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3638,7 +3640,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -92,8 +92,8 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3681,7 +3683,7 @@ void ChromeContentBrowserClient::BindCredentialManager - } +@@ -3758,7 +3760,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri + #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) @@ -101,7 +101,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) { const base::Value* audio_sandbox_enabled_policy_value = policies.GetValue(policy::key::kAudioSandboxEnabled); -@@ -3699,7 +3701,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& +@@ -3776,7 +3778,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& void ChromeContentBrowserClient::WillStartServiceManager() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -110,12 +110,12 @@ if (startup_data_) { auto* chrome_feature_list_creator = startup_data_->chrome_feature_list_creator(); -@@ -3984,7 +3986,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4043,7 +4045,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - MaybeAddThrottle(&throttles, - browser_switcher::BrowserSwitcherNavigationThrottle:: - MaybeCreateThrottleFor(handle)); + MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: + MaybeCreateThrottleFor(handle), + &throttles); |