diff --git a/build/patches/00Fix-chromium-build-bugs.patch b/build/patches/00Fix-chromium-build-bugs.patch index 8b50d633..8235431a 100644 --- a/build/patches/00Fix-chromium-build-bugs.patch +++ b/build/patches/00Fix-chromium-build-bugs.patch @@ -14,6 +14,7 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=1491776#c10 .../api/autofill_private/autofill_util.cc | 2 ++ .../reading_list/reading_list_event_router.h | 2 +- ...vigation_predictor_metrics_document_data.h | 2 ++ + .../notification_platform_bridge_linux.cc | 2 +- chrome/browser/safe_browsing/BUILD.gn | 1 + .../tpcd/support/tpcd_support_manager.cc | 2 +- ...ion_consented_debugging_infobar_delegate.h | 2 +- @@ -34,7 +35,7 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=1491776#c10 crypto/BUILD.gn | 3 ++ net/BUILD.gn | 1 + third_party/libevent/BUILD.gn | 2 ++ - 29 files changed, 64 insertions(+), 49 deletions(-) + 30 files changed, 65 insertions(+), 50 deletions(-) diff --git a/BUILD.gn b/BUILD.gn --- a/BUILD.gn @@ -164,6 +165,18 @@ diff --git a/chrome/browser/navigation_predictor/navigation_predictor_metrics_do // True if the anchor element is still in viewport, otherwise false. bool is_in_viewport = false; // True if the pointer is still hovering over the anchor element, +diff --git a/chrome/browser/notifications/notification_platform_bridge_linux.cc b/chrome/browser/notifications/notification_platform_bridge_linux.cc +--- a/chrome/browser/notifications/notification_platform_bridge_linux.cc ++++ b/chrome/browser/notifications/notification_platform_bridge_linux.cc +@@ -883,7 +883,7 @@ class NotificationPlatformBridgeLinuxImpl + kMethodCloseNotification); + dbus::MessageWriter writer(&method_call); + writer.AppendUint32(data->dbus_id); +- notification_proxy_->CallMethodAndBlock( ++ (void)notification_proxy_->CallMethodAndBlock( + &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT); + to_erase.push_back(data); + } diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index 776703f4..c4248b2d 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/android/BUILD.gn | 48 +- chrome/android/chrome_java_sources.gni | 5 - .../features/cablev2_authenticator/BUILD.gn | 2 - - chrome/android/java/AndroidManifest.xml | 51 -- + chrome/android/java/AndroidManifest.xml | 50 -- .../org/chromium/chrome/browser/AppHooks.java | 9 +- .../browser/ChromeBackgroundService.java | 11 +- .../browser/PlayServicesVersionInfo.java | 11 +- @@ -105,7 +105,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../preconditions/javatests/BUILD.gn | 1 - .../gms/ChromiumPlayServicesAvailability.java | 10 +- third_party/cardboard/BUILD.gn | 4 - - 81 files changed, 97 insertions(+), 2012 deletions(-) + 81 files changed, 97 insertions(+), 2011 deletions(-) diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected --- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected @@ -387,12 +387,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1035,20 +1000,10 @@ by a child template that "extends" this file. - -- - +@@ -1040,15 +1005,6 @@ by a child template that "extends" this file. @@ -408,7 +403,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1299,12 +1254,6 @@ by a child template that "extends" this file. +@@ -1299,12 +1255,6 @@ by a child template that "extends" this file. {% endif %} diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index cb874696..b9cb5adc 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -11,6 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../android/metrics/uma_session_stats.cc | 10 - .../android/signin/signin_manager_android.cc | 27 +- chrome/browser/browser_process_impl.cc | 1 - + chrome/browser/chrome_browser_main.cc | 8 - .../browser/chrome_content_browser_client.cc | 35 +- .../domain_reliability/service_factory.cc | 33 +- chrome/browser/extensions/BUILD.gn | 1 - @@ -58,7 +59,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html content/public/common/content_features.cc | 6 +- net/base/url_util.cc | 21 -- services/network/network_context.cc | 2 +- - 51 files changed, 60 insertions(+), 797 deletions(-) + 52 files changed, 60 insertions(+), 805 deletions(-) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn @@ -167,6 +168,31 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro component_updater_ = component_updater::ComponentUpdateServiceFactory( component_updater::MakeChromeComponentUpdaterConfigurator( base::CommandLine::ForCurrentProcess(), +diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc +--- a/chrome/browser/chrome_browser_main.cc ++++ b/chrome/browser/chrome_browser_main.cc +@@ -515,10 +515,6 @@ void ProcessSingletonNotificationCallbackImpl( + + StartupBrowserCreator::ProcessCommandLineAlreadyRunning( + command_line, current_directory, startup_profile_path_info); +- +- // Record now as the last successful chrome start. +- if (ShouldRecordActiveUse(command_line)) +- GoogleUpdateSettings::SetLastRunTime(); + } + #endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON) + +@@ -1791,10 +1787,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { + upgrade_util::SaveLastModifiedTimeOfExe(); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + +- // Record now as the last successful chrome start. +- if (ShouldRecordActiveUse(*base::CommandLine::ForCurrentProcess())) +- GoogleUpdateSettings::SetLastRunTime(); +- + // Create the RunLoop for MainMessageLoopRun() to use and transfer + // ownership of the browser's lifetime to the BrowserProcess. + DCHECK(!GetMainRunLoopInstance()); diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc