From 3222b0dc89cdc5d0947d15f71211a50ea45a9dac Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Mon, 7 Aug 2023 14:59:32 +0200 Subject: [PATCH] Merged some WIN patches with the corresponding --- build/bromite_patches_list.txt | 2 - ...Add-lifetime-options-for-permissions.patch | 22 --------- ...DDTO-Remove-binary-blob-integrations.patch | 49 ------------------- 3 files changed, 73 deletions(-) delete mode 100644 build/patches/00WIN-ADDTO-Add-lifetime-options-for-permissions.patch delete mode 100644 build/patches/00WIN-ADDTO-Remove-binary-blob-integrations.patch diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index cba3a9c6..32f2375f 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -195,8 +195,6 @@ eyeo-beta-114.0.5735.53-v1-extension_api.patch 00WIN-ADDTO-Add-bookmark-import-export-actions.patch 00WIN-ADDTO-openH264--enable-ARM-ARM64-optimizati.patch 00WIN-ADDTO-AImageReader-CFI-crash-mitigations.patch -00WIN-ADDTO-Remove-binary-blob-integrations.patch -00WIN-ADDTO-Add-lifetime-options-for-permissions.patch 00WIN-ADDTO-Disable-various-metrics.patch 00WIN-ADDTO-Do-not-build-API-keys-infobar.patch 00WIN-ADDTO-Revert-flags--remove-num-raster-thre.patch diff --git a/build/patches/00WIN-ADDTO-Add-lifetime-options-for-permissions.patch b/build/patches/00WIN-ADDTO-Add-lifetime-options-for-permissions.patch deleted file mode 100644 index 93e9697f..00000000 --- a/build/patches/00WIN-ADDTO-Add-lifetime-options-for-permissions.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Your Name -Date: Wed, 12 Oct 2022 11:52:11 +0000 -Subject: WIN ADDTO Add lifetime options for permissions - ---- - .../ui/views/permissions/permission_prompt_bubble_base_view.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc ---- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc -+++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc -@@ -336,7 +336,7 @@ void PermissionPromptBubbleBaseView::RunButtonCallbacks( - delegate_->Accept(); - return; - case PermissionDialogButton::kAcceptOnce: -- delegate_->AcceptThisTime(); -+ delegate_->AcceptThisTime(content_settings::LifetimeMode::Always); - return; - case PermissionDialogButton::kDeny: - delegate_->Deny(); --- -2.25.1 diff --git a/build/patches/00WIN-ADDTO-Remove-binary-blob-integrations.patch b/build/patches/00WIN-ADDTO-Remove-binary-blob-integrations.patch deleted file mode 100644 index 26b5470b..00000000 --- a/build/patches/00WIN-ADDTO-Remove-binary-blob-integrations.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Your Name -Date: Wed, 12 Oct 2022 11:41:35 +0000 -Subject: WIN ADDTO Remove binary blob integrations - ---- - components/gcm_driver/gcm_client_impl.cc | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc ---- a/components/gcm_driver/gcm_client_impl.cc -+++ b/components/gcm_driver/gcm_client_impl.cc -@@ -450,7 +450,7 @@ void GCMClientImpl::StartGCM() { - - void GCMClientImpl::InitializeMCSClient() { - DCHECK(network_connection_tracker_); -- return; -+ if ((true)) return; - std::vector endpoints; - endpoints.push_back(gservices_settings_.GetMCSMainEndpoint()); - GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint(); -@@ -644,7 +644,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope, - int interval_ms) { - DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); - DCHECK(mcs_client_); -- return; -+ if ((true)) return; - mcs_client_->AddHeartbeatInterval(scope, interval_ms); - } - -@@ -656,7 +656,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { - - void GCMClientImpl::StartCheckin() { - DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); -- return; -+ if ((true)) return; - - // Make sure no checkin is in progress. - if (checkin_request_) -@@ -735,7 +735,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { - - void GCMClientImpl::SchedulePeriodicCheckin() { - DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); -- return; -+ if ((true)) return; - - // Make sure no checkin is in progress. - if (checkin_request_.get() || !device_checkin_info_.accounts_set) --- -2.25.1