From c2edca82e19d2a4809bb7dcbdd6c3bfc010e645c Mon Sep 17 00:00:00 2001
From: Allen Bauer <kylixrd@chromium.org>
Date: Tue, 17 May 2022 19:47:33 +0000
Subject: [PATCH] [ViewAXTreeManager] Use only OnWidgetDestroying.
Change-Id: I1bce2f302dda0ba4db9e74d88e36974bbd8259f9
Bug: 1240365
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3648307
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1004401}
---
ui/views/accessibility/views_ax_tree_manager.cc | 9 ---------
ui/views/accessibility/views_ax_tree_manager.h | 1 -
2 files changed, 10 deletions(-)
diff --git a/ui/views/accessibility/views_ax_tree_manager.cc b/ui/views/accessibility/views_ax_tree_manager.cc
index 9ddd02d0e05d5..2767d1d82a6bd 100644
--- a/ui/views/accessibility/views_ax_tree_manager.cc
+++ b/ui/views/accessibility/views_ax_tree_manager.cc
@@ -129,15 +129,6 @@ void ViewsAXTreeManager::OnWidgetDestroyed(Widget* widget) {
widget_ = nullptr;
}
-void ViewsAXTreeManager::OnWidgetClosing(Widget* widget) {
- // If a widget becomes disconnected from its root view, we shouldn't keep it
- // in the map or attempt any operations on it.
- if (widget->is_top_level() || !widget->GetRootView())
- views::WidgetAXTreeIDMap::GetInstance().RemoveWidget(widget);
-
- widget_ = nullptr;
-}
-
void ViewsAXTreeManager::PerformAction(const ui::AXActionData& data) {
if (!widget_ || !widget_->GetRootView())
return;
diff --git a/ui/views/accessibility/views_ax_tree_manager.h b/ui/views/accessibility/views_ax_tree_manager.h
index 3c28a84ddcbdd..b1b4d33321f80 100644
--- a/ui/views/accessibility/views_ax_tree_manager.h
+++ b/ui/views/accessibility/views_ax_tree_manager.h
@@ -98,7 +98,6 @@ class VIEWS_EXPORT ViewsAXTreeManager : public ui::AXTreeManager,
// WidgetObserver implementation.
void OnWidgetDestroyed(Widget* widget) override;
- void OnWidgetClosing(Widget* widget) override;
private:
using ViewsAXTreeSerializer = ui::AXTreeSerializer<AXAuraObjWrapper*>;