Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed CHECK & DCHECK failure from download bubble (uplift to 1.53.x) #18709

Merged
merged 1 commit into from
Jun 5, 2023
Merged

Fixed CHECK & DCHECK failure from download bubble (uplift to 1.53.x) #18709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions patches/chrome-browser-ui-views-download-bubble-download_bubble_security_view.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/chrome/browser/ui/views/download/bubble/download_bubble_security_view.cc b/chrome/browser/ui/views/download/bubble/download_bubble_security_view.cc
index 97b2152c4862ef6f8fbb4593446b9998f44757c6..35b36e4e0838e12b2acd074f31f1bcc932b71b4d 100644
--- a/chrome/browser/ui/views/download/bubble/download_bubble_security_view.cc
+++ b/chrome/browser/ui/views/download/bubble/download_bubble_security_view.cc
@@ -327,6 +327,7 @@ void DownloadBubbleSecurityView::UpdateAccessibilityTextAndFocus() {
// Announce that the subpage was opened to inform the user about the changes
// in the UI.
#if BUILDFLAG(IS_MAC)
+ GetViewAccessibility().OverrideRole(ax::mojom::Role::kAlert);
GetViewAccessibility().OverrideName(ui_info.warning_summary);
NotifyAccessibilityEvent(ax::mojom::Event::kAlert, true);
#else
20 changes: 20 additions & 0 deletions patches/chrome-browser-ui-views-download-bubble-download_toolbar_button_view.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc b/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc
index 394cded1d5e83248d5f26b371c2f2f521d760163..126eab298d57bdbd129873f5754aaf68ce6f06f3 100644
--- a/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc
+++ b/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc
@@ -419,6 +419,7 @@ void DownloadToolbarButtonView::OpenPrimaryDialog() {
primary_view_->SetVisible(true);
security_view_->SetVisible(false);
bubble_delegate_->SetButtons(ui::DIALOG_BUTTON_NONE);
+ bubble_delegate_->SetDefaultButton(ui::DIALOG_BUTTON_NONE);
bubble_delegate_->set_margins(GetPrimaryViewMargin());
ResizeDialog();
}
@@ -468,6 +469,7 @@ void DownloadToolbarButtonView::CreateBubbleDialogDelegate(
bubble_delegate->SetShowTitle(false);
bubble_delegate->SetShowCloseButton(false);
bubble_delegate->SetButtons(ui::DIALOG_BUTTON_NONE);
+ bubble_delegate->SetDefaultButton(ui::DIALOG_BUTTON_NONE);
bubble_delegate->RegisterDeleteDelegateCallback(
base::BindOnce(&DownloadToolbarButtonView::OnBubbleDelegateDeleted,
weak_factory_.GetWeakPtr()));