Merged some WIN patches with the corresponding
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
From: Your Name <you@example.com>
|
||||
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
|
||||
@@ -1,49 +0,0 @@
|
||||
From: Your Name <you@example.com>
|
||||
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<GURL> 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
|
||||
Reference in New Issue
Block a user