From 0a8a5b85a1c9bd4141072457453e600d8787ab55 Mon Sep 17 00:00:00 2001
From: Erik Chen <[email protected]>
Date: Thu, 03 Sep 2026 08:25:05 -0700
Subject: [PATCH] CertificateSelector: Gate table double-click on input protection

Double-clicking a row in the certificate table calls AcceptDialog()
directly and never consults the DialogClientView input protector that
gates the OK button on the same dialog. Consult the protector before
accepting so both accept surfaces behave consistently.

TableViewObserver::OnDoubleClick() does not receive the originating
ui::Event, so a mouse event stamped at the current time is used;
OnDoubleClick() is dispatched synchronously from
TableView::OnMousePressed(), so this is equivalent to gating on the
real event.

The existing DoubleClick test now resets the protector before
double-clicking, and a new test covers the ignored case.

TAG=agy
CONV=a746e443-38b2-4cab-937a-8d4d22e2eb37

Bug: 522299740
Change-Id: I756a7926b83a3818f5db353d4d1aef6a884ee77d
Agent-Generated: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8339532
Commit-Queue: Erik Chen <[email protected]>
Reviewed-by: David Pennington <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1691607}
---
diff --git a/chrome/browser/ui/views/certificate_selector.cc b/chrome/browser/ui/views/certificate_selector.cc
index 4156704..98e63b81 100644
--- a/chrome/browser/ui/views/certificate_selector.cc
+++ b/chrome/browser/ui/views/certificate_selector.cc
@@ -39,11 +39,14 @@
 #include "ui/base/models/table_model_observer.h"
 #include "ui/base/mojom/dialog_button.mojom.h"
 #include "ui/base/mojom/ui_base_types.mojom-shared.h"
+#include "ui/events/base_event_utils.h"
+#include "ui/events/event.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
+#include "ui/views/window/dialog_client_view.h"
 
 #if BUILDFLAG(IS_CHROMEOS)
 #include "chrome/browser/ash/certificate_provider/certificate_provider_service.h"
@@ -344,9 +347,23 @@
 }
 
 void CertificateSelector::OnDoubleClick() {
-  if (GetSelectedCert()) {
-    AcceptDialog();
+  if (!GetSelectedCert()) {
+    return;
   }
+
+  views::DialogClientView* const client_view = GetDialogClientView();
+  if (client_view) {
+    const ui::MouseEvent event(ui::EventType::kMousePressed, gfx::Point(),
+                               gfx::Point(), ui::EventTimeForNow(),
+                               ui::EF_LEFT_MOUSE_BUTTON,
+                               ui::EF_LEFT_MOUSE_BUTTON);
+    if (client_view->IsPossiblyUnintendedInteraction(
+            event, ShouldAllowKeyEventsDuringInputProtection())) {
+      return;
+    }
+  }
+
+  AcceptDialog();
 }
 
 BEGIN_METADATA(CertificateSelector)
diff --git a/chrome/browser/ui/views/certificate_selector_interactive_uitest.cc b/chrome/browser/ui/views/certificate_selector_interactive_uitest.cc
index 52d5f6f..c2ff2cb 100644
--- a/chrome/browser/ui/views/certificate_selector_interactive_uitest.cc
+++ b/chrome/browser/ui/views/certificate_selector_interactive_uitest.cc
@@ -149,6 +149,8 @@
   base::RunLoop loop;
   selector_->set_on_destroy(loop.QuitClosure());
 
+  selector_->ResetViewShownTimeStampForTesting();
+
   // Simulate double clicking on an entry in the certificate list.
   selector_->OnDoubleClick();
 
@@ -160,3 +162,17 @@
   EXPECT_TRUE(accepted);
   EXPECT_FALSE(canceled);
 }
+
+IN_PROC_BROWSER_TEST_F(CertificateSelectorTest,
+                       DoubleClickSoonAfterShowIsIgnored) {
+  bool accepted = false;
+  bool canceled = false;
+  selector_->TrackState(&accepted, &canceled);
+
+  // Simulate double clicking immediately after the dialog is shown. It should
+  // be ignored by the input protector.
+  selector_->OnDoubleClick();
+
+  EXPECT_FALSE(accepted);
+  EXPECT_FALSE(canceled);
+}

diff --git a/chrome/browser/ui/views/certificate_selector_interactive_uitest.cc b/chrome/browser/ui/views/certificate_selector_interactive_uitest.cc
index 52d5f6f..c2ff2cb 100644
--- a/chrome/browser/ui/views/certificate_selector_interactive_uitest.cc
+++ b/chrome/browser/ui/views/certificate_selector_interactive_uitest.cc
@@ -149,6 +149,8 @@
   base::RunLoop loop;
   selector_->set_on_destroy(loop.QuitClosure());
 
+  selector_->ResetViewShownTimeStampForTesting();
+
   // Simulate double clicking on an entry in the certificate list.
   selector_->OnDoubleClick();
 
@@ -160,3 +162,17 @@
   EXPECT_TRUE(accepted);
   EXPECT_FALSE(canceled);
 }
+
+IN_PROC_BROWSER_TEST_F(CertificateSelectorTest,
+                       DoubleClickSoonAfterShowIsIgnored) {
+  bool accepted = false;
+  bool canceled = false;
+  selector_->TrackState(&accepted, &canceled);
+
+  // Simulate double clicking immediately after the dialog is shown. It should
+  // be ignored by the input protector.
+  selector_->OnDoubleClick();
+
+  EXPECT_FALSE(accepted);
+  EXPECT_FALSE(canceled);
+}