Replace WidgetObserver::OnWidgetClosing() with OnWidgetDestroying()

In some cases, OnWidgetClosing() is not called when the widget is closed, resulting an invalid pointer |widget_| stored in WebContentsDisplayObserverView. This CL replaces OnWidgetClosing() with OnWidgetDestroying(), which is recommended in crbug.com/1240365 Bug: 1291728 Change-Id: I64fef8b30930f60220008809ee00f4385d6c3520 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3425473 Auto-Submit: Muyao Xu <muyaoxu@google.com> Reviewed-by: Takumi Fujimoto <takumif@chromium.org> Commit-Queue: Takumi Fujimoto <takumif@chromium.org> Cr-Commit-Position: refs/heads/main@{#965431}
chromium · Jan 31, 2022 · 4535fe2 · 4535fe2
1 parent 1933c3b
commit 4535fe2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/chrome/browser/ui/views/media_router/web_contents_display_observer_view.cc b/chrome/browser/ui/views/media_router/web_contents_display_observer_view.cc
@@ -65,7 +65,7 @@ void WebContentsDisplayObserverView::OnBrowserSetLastActive(Browser* browser) {
   }
 }
 
-void WebContentsDisplayObserverView::OnWidgetClosing(views::Widget* widget) {
+void WebContentsDisplayObserverView::OnWidgetDestroying(views::Widget* widget) {
   if (widget_)
     widget_->RemoveObserver(this);
   widget_ = nullptr;

diff --git a/chrome/browser/ui/views/media_router/web_contents_display_observer_view.h b/chrome/browser/ui/views/media_router/web_contents_display_observer_view.h
@@ -29,7 +29,7 @@ class WebContentsDisplayObserverView : public WebContentsDisplayObserver,
   void OnBrowserSetLastActive(Browser* browser) override;
 
   // views::WidgetObserver overrides:
-  void OnWidgetClosing(views::Widget* widget) override;
+  void OnWidgetDestroying(views::Widget* widget) override;
   void OnWidgetBoundsChanged(views::Widget* widget,
                              const gfx::Rect& new_bounds) override;