Fix more WidgetObserver usages

These instances were found by adding a CHECK to the WidgetObserver DTOR
to ensure the observer is removed before destruction and then running
all tests.

Bug: 1055483
Change-Id: I83353f33962b00f0f922a21ebb0afb2131295482
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2165105
Commit-Queue: Richard Knoll <knollr@chromium.org>
Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#763422}

chrome/browser/chromeos/lock_screen_apps/first_app_run_toast_manager.cc

@@ -136,8 +136,8 @@ void FirstAppRunToastManager::CreateAndShowToastDialog() {
       base::UTF8ToUTF16(app_window_->GetExtension()->short_name()),
       base::BindOnce(&FirstAppRunToastManager::ToastDialogDismissed,
                      weak_ptr_factory_.GetWeakPtr()));
-  toast_dialog->Show();
-  toast_widget_ = toast_dialog->GetWidget();
+  toast_widget_ = views::BubbleDialogDelegateView::CreateBubble(toast_dialog);
+  toast_widget_->Show();
   AdjustToastWidgetBounds();
   toast_widget_observer_.Add(toast_widget_);
 }

chrome/browser/chromeos/lock_screen_apps/toast_dialog_view.cc

@@ -75,19 +75,6 @@ ToastDialogView::ToastDialogView(const base::string16& app_name,
 
 ToastDialogView::~ToastDialogView() = default;
 
-void ToastDialogView::Show() {
-  views::Widget::InitParams params =
-      GetDialogWidgetInitParams(this, nullptr, nullptr, gfx::Rect());
-
-  ash_util::SetupWidgetInitParamsForContainer(
-      &params, ash::kShellWindowId_SettingBubbleContainer);
-
-  views::Widget* widget = new views::Widget;  // owned by native widget
-  widget->Init(std::move(params));
-  widget->AddObserver(this);
-  widget->Show();
-}
-
 ui::ModalType ToastDialogView::GetModalType() const {
   return ui::MODAL_TYPE_NONE;
 }
@@ -109,4 +96,11 @@ bool ToastDialogView::ShouldShowCloseButton() const {
   return true;
 }
 
+void ToastDialogView::OnBeforeBubbleWidgetInit(
+    views::Widget::InitParams* params,
+    views::Widget* widget) const {
+  ash_util::SetupWidgetInitParamsForContainer(
+      params, ash::kShellWindowId_SettingBubbleContainer);
+}
+
 }  // namespace lock_screen_apps

chrome/browser/chromeos/lock_screen_apps/toast_dialog_view.h

@@ -14,23 +14,20 @@ namespace lock_screen_apps {
 
 // The system modal bubble dialog shown to the user when a lock screen app is
 // first launched from the lock screen. The dialog will block the app UI until
-// the uesr closes it.
+// the user closes it.
 class ToastDialogView : public views::BubbleDialogDelegateView {
  public:
   ToastDialogView(const base::string16& app_name,
                   base::OnceClosure dismissed_callback);
   ~ToastDialogView() override;
 
-  // Shows the toast dialog.
-  void Show();
-
-  // views::WidgetDelegate:
+  // views::BubbleDialogDelegateView:
   ui::ModalType GetModalType() const override;
   base::string16 GetWindowTitle() const override;
-
-  // views::BubbleDialogDelegate:
   void AddedToWidget() override;
   bool ShouldShowCloseButton() const override;
+  void OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
+                                views::Widget* widget) const override;
 
  private:
   // The name of the app for which the dialog is shown.

chrome/browser/ui/views/frame/browser_view.cc

@@ -2393,6 +2393,7 @@ views::View* BrowserView::CreateOverlayView() {
 }
 
 void BrowserView::OnWidgetDestroying(views::Widget* widget) {
+  widget_observer_.Remove(widget);
   // Destroy any remaining WebContents early on. Doing so may result in
   // calling back to one of the Views/LayoutManagers or supporting classes of
   // BrowserView. By destroying here we ensure all said classes are valid.
@@ -2640,7 +2641,7 @@ void BrowserView::ViewHierarchyChanged(
 void BrowserView::AddedToWidget() {
   views::ClientView::AddedToWidget();
 
-  GetWidget()->AddObserver(this);
+  widget_observer_.Add(GetWidget());
 
   // Stow a pointer to this object onto the window handle so that we can get at
   // it later when all we have is a native view.

chrome/browser/ui/views/frame/browser_view.h

@@ -870,6 +870,8 @@ class BrowserView : public BrowserWindow,
   ScopedObserver<banners::AppBannerManager, banners::AppBannerManager::Observer>
       app_banner_manager_observer_{this};
 
+  ScopedObserver<views::Widget, views::WidgetObserver> widget_observer_{this};
+
   bool interactive_resize_in_progress_ = false;
 
   mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_{

ui/views/bubble/bubble_dialog_delegate_view.cc

@@ -179,7 +179,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
 #endif
 
   bubble_delegate->SizeToContents();
-  bubble_widget->AddObserver(bubble_delegate);
+  bubble_delegate->widget_observer_.Add(bubble_widget);
   return bubble_widget;
 }
 
@@ -203,8 +203,6 @@ BubbleDialogDelegateView::BubbleDialogDelegateView(View* anchor_view,
 }
 
 BubbleDialogDelegateView::~BubbleDialogDelegateView() {
-  if (GetWidget())
-    GetWidget()->RemoveObserver(this);
   SetLayoutManager(nullptr);
   SetAnchorView(nullptr);
 }
@@ -263,6 +261,9 @@ void BubbleDialogDelegateView::OnWidgetClosing(Widget* widget) {
 void BubbleDialogDelegateView::OnWidgetDestroying(Widget* widget) {
   if (anchor_widget() == widget)
     SetAnchorView(nullptr);
+
+  if (widget_observer_.IsObserving(widget))
+    widget_observer_.Remove(widget);
 }
 
 void BubbleDialogDelegateView::OnWidgetVisibilityChanging(Widget* widget,

ui/views/bubble/bubble_dialog_delegate_view.h

@@ -9,6 +9,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
+#include "base/scoped_observer.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_enums.mojom-forward.h"
 #include "ui/base/accelerators/accelerator.h"
@@ -160,7 +161,6 @@ class VIEWS_EXPORT BubbleDialogDelegateView : public DialogDelegateView,
   void OnAnchorBoundsChanged();
 
  protected:
-
   // Returns the desired arrow post-RTL mirroring if needed.
   BubbleBorder::Arrow arrow() const { return arrow_; }
 
@@ -284,6 +284,8 @@ class VIEWS_EXPORT BubbleDialogDelegateView : public DialogDelegateView,
   std::unique_ptr<ui::BubbleCloser> mac_bubble_closer_;
 #endif
 
+  ScopedObserver<views::Widget, views::WidgetObserver> widget_observer_{this};
+
   DISALLOW_COPY_AND_ASSIGN(BubbleDialogDelegateView);
 };