diff options
Diffstat (limited to 'www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc')
| -rw-r--r-- | www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc | 57 |
1 files changed, 21 insertions, 36 deletions
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 61cfea1f6902..2c8e20b8acde 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -387,7 +387,7 @@ +@@ -392,7 +392,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -471,17 +471,17 @@ +@@ -477,12 +477,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,13 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif - --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - #if !BUILDFLAG(IS_ANDROID) - #include "base/debug/leak_annotations.h" - #include "components/crash/core/app/breakpad_linux.h" -@@ -489,13 +489,13 @@ +@@ -491,13 +491,13 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -46,7 +40,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -524,11 +524,11 @@ +@@ -526,11 +526,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -60,16 +54,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif defined(USE_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -941,7 +941,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo - int GetCrashSignalFD(const base::CommandLine& command_line) { - return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket(); - } --#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) -+#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( - const std::string& process_type) { - base::FilePath dumps_path; -@@ -1504,7 +1504,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1512,7 +1512,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -78,7 +63,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1543,7 +1543,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1551,7 +1551,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -87,7 +72,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1564,7 +1564,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1572,7 +1572,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -96,7 +81,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif defined(USE_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1583,7 +1583,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1591,7 +1591,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -105,16 +90,16 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2352,6 +2352,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - #elif BUILDFLAG(IS_POSIX) +@@ -2371,6 +2371,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + #if(0) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; +#elif BUILDFLAG(IS_BSD) + bool enable_crash_reporter = false; - #else + #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2705,7 +2707,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2735,7 +2737,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -123,7 +108,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4155,7 +4157,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4182,7 +4184,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -132,7 +117,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4595,14 +4597,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4626,14 +4628,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -149,12 +134,12 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4631,7 +4633,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4660,7 +4662,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + } + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), + &throttles); |