From 068ee7a3c1ef206a43e4e0ebf1bb05296e553457 Mon Sep 17 00:00:00 2001 From: Illia Klimov Date: Wed, 9 Feb 2022 17:37:20 +0000 Subject: [PATCH] [M98] Unregister Accelerators when AccessiblePaneView is destroyed. This CL makes sure that a focus change listener and all Accelerators are unregistered when the AccessiblePaneView is going to be destroyed. (cherry picked from commit 7125ad12cdfd41bce01723aa4769b853e655d8de) Bug: 1284293 Change-Id: Icd11523be7ab5728e181148a8fd1baec5349513e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3429899 Reviewed-by: Balazs Engedy Reviewed-by: Peter Kasting Commit-Queue: Illia Klimov Cr-Original-Commit-Position: refs/heads/main@{#966217} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3450213 Commit-Queue: Peter Kasting Cr-Commit-Position: refs/branch-heads/4758@{#1121} Cr-Branched-From: 4a2cf4baf90326df19c3ee70ff987960d59a386e-refs/heads/main@{#950365} --- ui/views/accessible_pane_view.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/views/accessible_pane_view.cc b/ui/views/accessible_pane_view.cc index 9c5be450dd5de..f23dd2c2c34f8 100644 --- a/ui/views/accessible_pane_view.cc +++ b/ui/views/accessible_pane_view.cc @@ -54,7 +54,7 @@ AccessiblePaneView::AccessiblePaneView() AccessiblePaneView::~AccessiblePaneView() { if (pane_has_focus_) { - focus_manager_->RemoveFocusChangeListener(this); + RemovePaneFocus(); } }