Fixed bug where Uninstall dialog forces its own widget to close twice

chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 21 matching lines @@
 // Views implementation of the uninstall dialog.
 class ExtensionUninstallDialogViews
     : public extensions::ExtensionUninstallDialog {
  public:
   ExtensionUninstallDialogViews(
       Profile* profile,
       gfx::NativeWindow parent,
       extensions::ExtensionUninstallDialog::Delegate* delegate);
   virtual ~ExtensionUninstallDialogViews();
 
+  // Called when the ExtensionUninstallDialogDelegate has been destroyed to make
+  // sure we invalidate pointers.
+  void DialogDelegateDestroyed() { view_ = NULL; }
+
   // Forwards the accept and cancels to the delegate.
   void ExtensionUninstallAccepted();
   void ExtensionUninstallCanceled();
 
  private:
   virtual void Show() OVERRIDE;
 
   ExtensionUninstallDialogDelegateView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialogViews);
@@ skipping 62 matching lines @@
 }
 
 void ExtensionUninstallDialogViews::Show() {
   view_ = new ExtensionUninstallDialogDelegateView(
       this, extension_, triggering_extension_, &icon_);
   CreateBrowserModalDialogViews(view_, parent_)->Show();
 }
 
 void ExtensionUninstallDialogViews::ExtensionUninstallAccepted() {
   // The widget gets destroyed when the dialog is accepted.
+  view_->DialogDestroyed();
   view_ = NULL;
   delegate_->ExtensionUninstallAccepted();
 }
 
 void ExtensionUninstallDialogViews::ExtensionUninstallCanceled() {
   // The widget gets destroyed when the dialog is canceled.
+  view_->DialogDestroyed();
   view_ = NULL;
   delegate_->ExtensionUninstallCanceled();
 }
 
 ExtensionUninstallDialogDelegateView::ExtensionUninstallDialogDelegateView(
     ExtensionUninstallDialogViews* dialog_view,
     const extensions::Extension* extension,
     const extensions::Extension* triggering_extension,
     gfx::ImageSkia* image)
     : dialog_(dialog_view),
       triggered_by_extension_(triggering_extension != NULL) {
   // Scale down to icon size, but allow smaller icons (don't scale up).
   gfx::Size size(image->width(), image->height());
   if (size.width() > kIconSize || size.height() > kIconSize)
     size = gfx::Size(kIconSize, kIconSize);
   icon_ = new views::ImageView();
   icon_->SetImageSize(size);
   icon_->SetImage(*image);
   AddChildView(icon_);
 
   heading_ = new views::Label(base::UTF8ToUTF16(dialog_->GetHeadingText()));
   heading_->SetMultiLine(true);
   heading_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(heading_);
 }
 
 ExtensionUninstallDialogDelegateView::~ExtensionUninstallDialogDelegateView() {
+  // If we're here, 2 things could have happened. Either the user closed the
+  // dialog nicely and one of ExtensionUninstallAccepted or
+  // ExtensionUninstallCanceled has been called (in which case dialog_ will be
+  // NULL), *or* neither of them have been called and we are being forced closed
+  // by our parent widget. In this case, we need to make sure to notify dialog_
+  // not to call us again, since we're about to be freed by the Widget
+  // framework.
+  if (dialog_)
+    dialog_->DialogDelegateDestroyed();
 }
 
 base::string16 ExtensionUninstallDialogDelegateView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16((button == ui::DIALOG_BUTTON_OK) ?
       IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON : IDS_CANCEL);
 }
 
 bool ExtensionUninstallDialogDelegateView::Accept() {
   if (dialog_)
@@ skipping 52 matching lines @@
 
 }  // namespace
 
 // static
 extensions::ExtensionUninstallDialog*
 extensions::ExtensionUninstallDialog::Create(Profile* profile,
                                              gfx::NativeWindow parent,
                                              Delegate* delegate) {
   return new ExtensionUninstallDialogViews(profile, parent, delegate);
 }