Fix crashes related to the extension uninstall dialog.

The uninstall prompt is owned by the settings page (the dialog's delegate), which gets destroyed when the user navigates to a new page. We need to make sure we invalidate pointers to the settings page when this occurs.

This adds an ExtensionUninstallDialog with platform specific implementations.

GTK: The settings page owns the ExtensionUninstallDialogGtk, which closes the GTK prompt when being destroyed.

VIEWS: The views framework is a bit more convoluted because views owns the prompt's views::View. We have two classes: ExtensionUninstallDialogDelegateView owned by views, and ExtensionUninstallDialogViews owned by the settings page. If the user accepts or denies the prompt, we proxy the events through ExtensionUninstallDialogViews so we can invalidate pointers back to the views widget. If the settings page is destroyed, the ExtensionUninstallDialogViews closes the views widget after invalidating pointers back to the settings page.

COCOA: You can't navigate away from the page when the prompt is open, so the dialog can't outlive its delegate.

BUG=75011
TEST=see bug.

Review URL: http://codereview.chromium.org/7920023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102351 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_context_menu_model.cc

@@ -131,8 +131,9 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id) {
     }
     case UNINSTALL: {
       AddRef();  // Balanced in Accepted() and Canceled()
-      extension_uninstall_dialog_.reset(new ExtensionUninstallDialog(profile_));
-      extension_uninstall_dialog_->ConfirmUninstall(this, extension);
+      extension_uninstall_dialog_.reset(
+          ExtensionUninstallDialog::Create(profile_, this));
+      extension_uninstall_dialog_->ConfirmUninstall(extension);
       break;
     }
     case MANAGE: {
@@ -149,7 +150,7 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id) {
   }
 }
 
-void ExtensionContextMenuModel::ExtensionDialogAccepted() {
+void ExtensionContextMenuModel::ExtensionUninstallAccepted() {
   if (GetExtension())
     profile_->GetExtensionService()->UninstallExtension(extension_id_, false,
                                                         NULL);
@@ -157,7 +158,7 @@ void ExtensionContextMenuModel::ExtensionDialogAccepted() {
   Release();
 }
 
-void ExtensionContextMenuModel::ExtensionDialogCanceled() {
+void ExtensionContextMenuModel::ExtensionUninstallCanceled() {
   Release();
 }
 

chrome/browser/extensions/extension_context_menu_model.h

@@ -52,8 +52,8 @@ class ExtensionContextMenuModel
   virtual void ExecuteCommand(int command_id);
 
   // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted();
-  virtual void ExtensionDialogCanceled();
+  virtual void ExtensionUninstallAccepted();
+  virtual void ExtensionUninstallCanceled();
 
  private:
   void InitCommonCommands();

chrome/browser/extensions/extension_install_ui.h

@@ -24,7 +24,7 @@ class Profile;
 class InfoBarDelegate;
 class TabContents;
 
-// Displays all the UI around extension installation and uninstallation.
+// Displays all the UI around extension installation.
 class ExtensionInstallUI : public ImageLoadingTracker::Observer {
  public:
   enum PromptType {

chrome/browser/extensions/extension_uninstall_dialog.cc

@@ -17,21 +17,19 @@
 // Size of extension icon in top left of dialog.
 static const int kIconSize = 69;
 
-ExtensionUninstallDialog::ExtensionUninstallDialog(Profile* profile)
+ExtensionUninstallDialog::ExtensionUninstallDialog(
+    Profile* profile,
+    ExtensionUninstallDialog::Delegate* delegate)
     : profile_(profile),
-      ui_loop_(MessageLoop::current()),
-      delegate_(NULL),
+      delegate_(delegate),
       extension_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
-}
+      ui_loop_(MessageLoop::current()),
+      ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {}
 
-ExtensionUninstallDialog::~ExtensionUninstallDialog() {
-}
+ExtensionUninstallDialog::~ExtensionUninstallDialog() {}
 
-void ExtensionUninstallDialog::ConfirmUninstall(Delegate* delegate,
-                                                const Extension* extension) {
+void ExtensionUninstallDialog::ConfirmUninstall(const Extension* extension) {
   DCHECK(ui_loop_ == MessageLoop::current());
-  delegate_ = delegate;
   extension_ = extension;
 
   ExtensionResource image =
@@ -64,5 +62,5 @@ void ExtensionUninstallDialog::OnImageLoaded(SkBitmap* image,
                                              int index) {
   SetIcon(image);
 
-  Show(profile_, delegate_, extension_, &icon_);
+  Show();
 }

chrome/browser/extensions/extension_uninstall_dialog.h

@@ -19,34 +19,45 @@ class ExtensionUninstallDialog : public ImageLoadingTracker::Observer {
   class Delegate {
    public:
     // We call this method to signal that the uninstallation should continue.
-    virtual void ExtensionDialogAccepted() = 0;
+    virtual void ExtensionUninstallAccepted() = 0;
 
     // We call this method to signal that the uninstallation should stop.
-    virtual void ExtensionDialogCanceled() = 0;
+    virtual void ExtensionUninstallCanceled() = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
-  explicit ExtensionUninstallDialog(Profile* profile);
+  // Creates a platform specific implementation of ExtensionUninstallDialog.
+  static ExtensionUninstallDialog* Create(
+      Profile* profile, Delegate* delegate);
+
   virtual ~ExtensionUninstallDialog();
 
-  // This is called by the extensions management page to verify whether the
-  // uninstallation should proceed.
+  // This is called to verify whether the uninstallation should proceed.
   // Starts the process of showing a confirmation UI, which is split into two.
   // 1) Set off a 'load icon' task.
   // 2) Handle the load icon response and show the UI (OnImageLoaded).
-  void ConfirmUninstall(Delegate* delegate, const Extension* extension);
+  void ConfirmUninstall(const Extension* extension);
+
+ protected:
+  // Constructor used by the derived classes.
+  explicit ExtensionUninstallDialog(Profile* profile, Delegate* delegate);
+
+  Profile* profile_;
+
+  // The delegate we will call Accepted/Canceled on after confirmation dialog.
+  Delegate* delegate_;
+
+  // The extension we are showing the dialog for.
+  const Extension* extension_;
+
+  // The extensions icon.
+  SkBitmap icon_;
 
  private:
-  // Creates an appropriate ExtensionUninstallDialog for the platform.
-  static void Show(Profile* profile,
-                   Delegate* delegate,
-                   const Extension* extension,
-                   SkBitmap* icon);
-
-  // Sets the icon that will be used in any UI. If |icon| is NULL, or contains
-  // an empty bitmap, then a default icon will be used instead.
+  // Sets the icon that will be used in the dialog. If |icon| is NULL, or
+  // contains an empty bitmap, then we use a default icon instead.
   void SetIcon(SkBitmap* icon);
 
   // ImageLoadingTracker::Observer:
@@ -54,22 +65,16 @@ class ExtensionUninstallDialog : public ImageLoadingTracker::Observer {
                              const ExtensionResource& resource,
                              int index) OVERRIDE;
 
-  Profile* profile_;
-  MessageLoop* ui_loop_;
-
-  // The delegate we will call Accepted/Canceled on after confirmation UI.
-  Delegate* delegate_;
+  // Displays the prompt. This should only be called after loading the icon.
+  // The implementations of this method are platform-specific.
+  virtual void Show() = 0;
 
-  // The extension we are showing the UI for.
-  const Extension* extension_;
+  MessageLoop* ui_loop_;
 
   // Keeps track of extension images being loaded on the File thread for the
-  // purpose of showing the install UI.
+  // purpose of showing the dialog.
   ImageLoadingTracker tracker_;
 
-  // The extensions icon.
-  SkBitmap icon_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialog);
 };
 

chrome/browser/extensions/extensions_ui.cc

@@ -282,7 +282,7 @@ void ExtensionsDOMHandler::RegisterForNotifications() {
 ExtensionUninstallDialog* ExtensionsDOMHandler::GetExtensionUninstallDialog() {
   if (!extension_uninstall_dialog_.get()) {
     extension_uninstall_dialog_.reset(
-        new ExtensionUninstallDialog(Profile::FromWebUI(web_ui_)));
+        ExtensionUninstallDialog::Create(Profile::FromWebUI(web_ui_), this));
   }
   return extension_uninstall_dialog_.get();
 }
@@ -413,10 +413,10 @@ void ExtensionsDOMHandler::HandleUninstallMessage(const ListValue* args) {
 
   extension_id_prompting_ = extension_id;
 
-  GetExtensionUninstallDialog()->ConfirmUninstall(this, extension);
+  GetExtensionUninstallDialog()->ConfirmUninstall(extension);
 }
 
-void ExtensionsDOMHandler::ExtensionDialogAccepted() {
+void ExtensionsDOMHandler::ExtensionUninstallAccepted() {
   DCHECK(!extension_id_prompting_.empty());
 
   bool was_terminated = false;
@@ -443,7 +443,7 @@ void ExtensionsDOMHandler::ExtensionDialogAccepted() {
     HandleRequestExtensionsData(NULL);
 }
 
-void ExtensionsDOMHandler::ExtensionDialogCanceled() {
+void ExtensionsDOMHandler::ExtensionUninstallCanceled() {
   extension_id_prompting_ = "";
 }
 

chrome/browser/extensions/extensions_ui.h

@@ -74,8 +74,8 @@ class ExtensionsDOMHandler : public WebUIMessageHandler,
   virtual void OnPackFailure(const std::string& error) OVERRIDE;
 
   // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   // Callback for "requestExtensionsData" message.

chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm

@@ -40,18 +40,19 @@ class AsyncUninstaller : public ExtensionUninstallDialog::Delegate {
   AsyncUninstaller(const Extension* extension, Profile* profile)
       : extension_(extension),
         profile_(profile) {
-    extension_uninstall_dialog_.reset(new ExtensionUninstallDialog(profile));
-    extension_uninstall_dialog_->ConfirmUninstall(this, extension_);
+    extension_uninstall_dialog_.reset(
+        ExtensionUninstallDialog::Create(profile, this));
+    extension_uninstall_dialog_->ConfirmUninstall(extension_);
   }
 
   ~AsyncUninstaller() {}
 
   // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() {
+  virtual void ExtensionUninstallAccepted() {
     profile_->GetExtensionService()->
         UninstallExtension(extension_->id(), false, NULL);
   }
-  virtual void ExtensionDialogCanceled() {}
+  virtual void ExtensionUninstallCanceled() {}
 
  private:
   // The extension that we're loading the icon for. Weak.

chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm

@@ -17,12 +17,28 @@
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 
-// static
-void ExtensionUninstallDialog::Show(
-    Profile* profile,
-    ExtensionUninstallDialog::Delegate* delegate,
-    const Extension* extension,
-    SkBitmap* icon) {
+namespace {
+
+// The Cocoa implementation of ExtensionUninstallDialog. This has a less
+// complex life cycle than the Views and GTK implementations because the
+// dialog blocks the page from navigating away and destroying the dialog,
+// so there's no way for the dialog to outlive its delegate.
+class ExtensionUninstallDialogCocoa : public ExtensionUninstallDialog {
+ public:
+  ExtensionUninstallDialogCocoa(Profile* profile, Delegate* delegate);
+  virtual ~ExtensionUninstallDialogCocoa() OVERRIDE;
+
+ private:
+  virtual void Show() OVERRIDE;
+};
+
+ExtensionUninstallDialogCocoa::ExtensionUninstallDialogCocoa(
+    Profile* profile, ExtensionUninstallDialog::Delegate* delegate)
+    : ExtensionUninstallDialog(profile, delegate) {}
+
+ExtensionUninstallDialogCocoa::~ExtensionUninstallDialogCocoa() {}
+
+void ExtensionUninstallDialogCocoa::Show() {
   NSAlert* alert = [[[NSAlert alloc] init] autorelease];
 
   NSButton* continueButton = [alert addButtonWithTitle:l10n_util::GetNSString(
@@ -37,12 +53,20 @@ void ExtensionUninstallDialog::Show(
 
   [alert setMessageText:l10n_util::GetNSStringF(
        IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,
-       UTF8ToUTF16(extension->name()))];
+       UTF8ToUTF16(extension_->name()))];
   [alert setAlertStyle:NSWarningAlertStyle];
-  [alert setIcon:gfx::SkBitmapToNSImage(*icon)];
+  [alert setIcon:gfx::SkBitmapToNSImage(icon_)];
 
   if ([alert runModal] == NSAlertFirstButtonReturn)
-    delegate->ExtensionDialogAccepted();
+    delegate_->ExtensionUninstallAccepted();
   else
-    delegate->ExtensionDialogCanceled();
+    delegate_->ExtensionUninstallCanceled();
+}
+
+}  // namespace
+
+// static
+ExtensionUninstallDialog* ExtensionUninstallDialog::Create(
+    Profile* profile, Delegate* delegate) {
+  return new ExtensionUninstallDialogCocoa(profile, delegate);
 }

chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc

@@ -26,41 +26,59 @@ namespace {
 // Left or right margin.
 const int kPanelHorizMargin = 13;
 
-void OnResponse(GtkWidget* dialog, int response_id,
-                ExtensionUninstallDialog::Delegate* delegate) {
-  if (response_id == GTK_RESPONSE_ACCEPT)
-    delegate->ExtensionDialogAccepted();
-  else
-    delegate->ExtensionDialogCanceled();
-
-  gtk_widget_destroy(dialog);
-}
+// GTK implementation of the uninstall dialog.
+class ExtensionUninstallDialogGtk : public ExtensionUninstallDialog {
+ public:
+  ExtensionUninstallDialogGtk(Profile* profile, Delegate* delegate);
+  virtual ~ExtensionUninstallDialogGtk() OVERRIDE;
+
+ private:
+  virtual void Show() OVERRIDE;
+
+  CHROMEGTK_CALLBACK_1(ExtensionUninstallDialogGtk, void, OnResponse, int);
+
+  GtkWidget* dialog_;
+};
+
+ExtensionUninstallDialogGtk::ExtensionUninstallDialogGtk(
+    Profile* profile, ExtensionUninstallDialog::Delegate* delegate)
+    : ExtensionUninstallDialog(profile, delegate),
+      dialog_(NULL) {}
+
+void ExtensionUninstallDialogGtk::Show() {
+  Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
+  if (!browser) {
+    delegate_->ExtensionUninstallCanceled();
+    return;
+  }
+
+  BrowserWindow* browser_window = browser->window();
+  if (!browser_window) {
+    delegate_->ExtensionUninstallCanceled();
+    return;
+  }
 
-void ShowUninstallDialogGtk(GtkWindow* parent,
-                            SkBitmap* skia_icon,
-                            const Extension* extension,
-                            ExtensionUninstallDialog::Delegate *delegate) {
   // Build the dialog.
-  GtkWidget* dialog = gtk_dialog_new_with_buttons(
+  dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_EXTENSION_UNINSTALL_PROMPT_TITLE).c_str(),
-      parent,
+      browser_window->GetNativeHandle(),
       GTK_DIALOG_MODAL,
       GTK_STOCK_CANCEL,
       GTK_RESPONSE_CLOSE,
       l10n_util::GetStringUTF8(IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON).c_str(),
       GTK_RESPONSE_ACCEPT,
       NULL);
-  gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+  gtk_dialog_set_has_separator(GTK_DIALOG(dialog_), FALSE);
 
   // Create a two column layout.
-  GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+  GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_));
   gtk_box_set_spacing(GTK_BOX(content_area), ui::kContentAreaSpacing);
 
   GtkWidget* icon_hbox = gtk_hbox_new(FALSE, ui::kContentAreaSpacing);
   gtk_box_pack_start(GTK_BOX(content_area), icon_hbox, TRUE, TRUE, 0);
 
   // Put Icon in the left column.
-  GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(skia_icon);
+  GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&icon_);
   GtkWidget* icon = gtk_image_new_from_pixbuf(pixbuf);
   g_object_unref(pixbuf);
   gtk_box_pack_start(GTK_BOX(icon_hbox), icon, TRUE, TRUE, 0);
@@ -70,36 +88,44 @@ void ShowUninstallDialogGtk(GtkWindow* parent,
   gtk_box_pack_start(GTK_BOX(icon_hbox), right_column_area, TRUE, TRUE, 0);
 
   std::string heading_text = l10n_util::GetStringFUTF8(
-      IDS_EXTENSION_UNINSTALL_PROMPT_HEADING, UTF8ToUTF16(extension->name()));
+      IDS_EXTENSION_UNINSTALL_PROMPT_HEADING, UTF8ToUTF16(extension_->name()));
   GtkWidget* heading_label = gtk_label_new(heading_text.c_str());
   gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5);
   gtk_box_pack_start(GTK_BOX(right_column_area), heading_label, TRUE, TRUE, 0);
 
-  g_signal_connect(dialog, "response", G_CALLBACK(OnResponse), delegate);
-  gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-  gtk_widget_show_all(dialog);
+  g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
+  gtk_window_set_resizable(GTK_WINDOW(dialog_), FALSE);
+  gtk_widget_show_all(dialog_);
 }
 
-}  // namespace
-
-// static
-void ExtensionUninstallDialog::Show(
-    Profile* profile,
-    ExtensionUninstallDialog::Delegate* delegate,
-    const Extension* extension,
-    SkBitmap* icon) {
-  Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
-  if (!browser) {
-    delegate->ExtensionDialogCanceled();
-    return;
+ExtensionUninstallDialogGtk::~ExtensionUninstallDialogGtk() {
+  delegate_ = NULL;
+  if (dialog_) {
+    gtk_widget_destroy(dialog_);
+    dialog_ = NULL;
   }
+}
 
-  BrowserWindow* browser_window = browser->window();
-  if (!browser_window) {
-    delegate->ExtensionDialogCanceled();
-    return;
+void ExtensionUninstallDialogGtk::OnResponse(
+    GtkWidget* dialog, int response_id) {
+  CHECK_EQ(dialog_, dialog);
+
+  gtk_widget_destroy(dialog_);
+  dialog_ = NULL;
+
+  if (delegate_) {
+    if (response_id == GTK_RESPONSE_ACCEPT)
+      delegate_->ExtensionUninstallAccepted();
+    else
+      delegate_->ExtensionUninstallCanceled();
   }
+}
 
-  ShowUninstallDialogGtk(browser_window->GetNativeHandle(),
-                         icon, extension, delegate);
+}  // namespace
+
+// static
+// Platform specific implementation of the uninstall dialog show method.
+ExtensionUninstallDialog* ExtensionUninstallDialog::Create(
+    Profile* profile, Delegate* delegate) {
+  return new ExtensionUninstallDialogGtk(profile, delegate);
 }

chrome/browser/ui/panels/panel_settings_menu_model.cc

@@ -91,9 +91,9 @@ void PanelSettingsMenuModel::ExecuteCommand(int command_id) {
     case COMMAND_UNINSTALL:
       // TODO(jianli): Need to handle the case that the extension API requests
       // the panel to be closed when the uninstall dialog is still showing.
-      extension_uninstall_dialog_.reset(new ExtensionUninstallDialog(
-          browser->GetProfile()));
-      extension_uninstall_dialog_->ConfirmUninstall(this, extension);
+      extension_uninstall_dialog_.reset(
+          ExtensionUninstallDialog::Create(browser->GetProfile(), this));
+      extension_uninstall_dialog_->ConfirmUninstall(extension);
       break;
     case COMMAND_MANAGE:
       browser->ShowOptionsTab(chrome::kExtensionsSubPage);
@@ -104,7 +104,7 @@ void PanelSettingsMenuModel::ExecuteCommand(int command_id) {
   }
 }
 
-void PanelSettingsMenuModel::ExtensionDialogAccepted() {
+void PanelSettingsMenuModel::ExtensionUninstallAccepted() {
   const Extension* extension = panel_->GetExtension();
   DCHECK(extension);
 
@@ -112,5 +112,5 @@ void PanelSettingsMenuModel::ExtensionDialogAccepted() {
       UninstallExtension(extension->id(), false, NULL);
 }
 
-void PanelSettingsMenuModel::ExtensionDialogCanceled() {
+void PanelSettingsMenuModel::ExtensionUninstallCanceled() {
 }

chrome/browser/ui/panels/panel_settings_menu_model.h

@@ -28,8 +28,8 @@ class PanelSettingsMenuModel : public ui::SimpleMenuModel,
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
   // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   friend class PanelBrowserTest;

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

@@ -14,6 +14,8 @@
 #include "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/compositor/compositor.h"
+#include "ui/gfx/compositor/layer.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/layout/layout_constants.h"
@@ -26,135 +28,211 @@ namespace {
 const int kRightColumnWidth = 210;
 const int kIconSize = 69;
 
-class ExtensionUninstallDialogView : public views::DialogDelegateView {
+class ExtensionUninstallDialogDelegateView;
+
+// Views implementation of the uninstall dialog.
+class ExtensionUninstallDialogViews : public ExtensionUninstallDialog {
  public:
-  ExtensionUninstallDialogView(ExtensionUninstallDialog::Delegate* delegate,
-                               const Extension* extension,
-                               SkBitmap* icon)
-        : delegate_(delegate),
-          icon_(NULL) {
-    // Scale down to icon size, but allow smaller icons (don't scale up).
-    gfx::Size size(icon->width(), icon->height());
-    if (size.width() > kIconSize || size.height() > kIconSize)
-      size = gfx::Size(kIconSize, kIconSize);
-    icon_ = new views::ImageView();
-    icon_->SetImageSize(size);
-    icon_->SetImage(*icon);
-    AddChildView(icon_);
-
-    heading_ = new views::Label(UTF16ToWide(
-        l10n_util::GetStringFUTF16(IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,
-                                   UTF8ToUTF16(extension->name()))));
-    heading_->SetMultiLine(true);
-    heading_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-    AddChildView(heading_);
-  }
+  ExtensionUninstallDialogViews(Profile* profile,
+                                ExtensionUninstallDialog::Delegate* delegate);
+  virtual ~ExtensionUninstallDialogViews();
+
+  // Forwards the accept and cancels to the delegate.
+  void ExtensionUninstallAccepted();
+  void ExtensionUninstallCanceled();
+
+  ExtensionUninstallDialogDelegateView* view() { return view_; }
 
  private:
-  // views::DialogDelegateView:
+  void Show() OVERRIDE;
+
+  ExtensionUninstallDialogDelegateView* view_;
+
+  DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialogViews);
+};
+
+// The dialog's view, owned by the views framework.
+class ExtensionUninstallDialogDelegateView : public views::DialogDelegateView {
+ public:
+  ExtensionUninstallDialogDelegateView(
+      ExtensionUninstallDialogViews* dialog_view,
+      const Extension* extension,
+      SkBitmap* icon);
+  virtual ~ExtensionUninstallDialogDelegateView();
+
+  // Called when the ExtensionUninstallDialog has been destroyed to make sure
+  // we invalidate pointers.
+  void DialogDestroyed() { dialog_ = NULL; }
+
+ private:
+  // views::DialogDelegate:
   virtual std::wstring GetDialogButtonLabel(
-      MessageBoxFlags::DialogButton button) const OVERRIDE {
-    switch (button) {
-      case MessageBoxFlags::DIALOGBUTTON_OK:
-        return UTF16ToWide(
-            l10n_util::GetStringUTF16(
-                IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON));
-      case MessageBoxFlags::DIALOGBUTTON_CANCEL:
-        return UTF16ToWide(l10n_util::GetStringUTF16(IDS_CANCEL));
-      default:
-        NOTREACHED();
-        return L"";
-    }
-  }
+      MessageBoxFlags::DialogButton button) const OVERRIDE;
 
   virtual int GetDefaultDialogButton() const OVERRIDE {
     return MessageBoxFlags::DIALOGBUTTON_CANCEL;
   }
 
-  virtual bool Accept() OVERRIDE {
-    delegate_->ExtensionDialogAccepted();
-    return true;
-  }
-
-  virtual bool Cancel() OVERRIDE {
-    delegate_->ExtensionDialogCanceled();
-    return true;
-  }
+  virtual bool Accept() OVERRIDE;
+  virtual bool Cancel() OVERRIDE;
 
   // views::WidgetDelegate:
   virtual bool IsModal() const OVERRIDE { return true; }
-  virtual std::wstring GetWindowTitle() const OVERRIDE {
-    return UTF16ToWide(
-        l10n_util::GetStringUTF16(IDS_EXTENSION_UNINSTALL_PROMPT_TITLE));
-  }
-  virtual views::View* GetContentsView() { return this; }
+  virtual views::View* GetContentsView() OVERRIDE { return this; }
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
 
   // views::View:
-  virtual gfx::Size GetPreferredSize() OVERRIDE {
-    int width = kRightColumnWidth;
-    width += kIconSize;
-    width += views::kPanelHorizMargin * 3;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
-    int height = views::kPanelVertMargin * 2;
-    height += heading_->GetHeightForWidth(kRightColumnWidth);
+  virtual void Layout() OVERRIDE;
 
-    return gfx::Size(width,
-                     std::max(height, kIconSize + views::kPanelVertMargin * 2));
-  }
+  ExtensionUninstallDialogViews* dialog_;
 
-  virtual void Layout() OVERRIDE {
-    int x = views::kPanelHorizMargin;
-    int y = views::kPanelVertMargin;
-
-    heading_->SizeToFit(kRightColumnWidth);
-
-    if (heading_->height() <= kIconSize) {
-      icon_->SetBounds(x, y, kIconSize, kIconSize);
-      x += kIconSize;
-      x += views::kPanelHorizMargin;
-
-      heading_->SetX(x);
-      heading_->SetY(y + (kIconSize - heading_->height()) / 2);
-    } else {
-      icon_->SetBounds(x,
-                       y + (heading_->height() - kIconSize) / 2,
-                       kIconSize,
-                       kIconSize);
-      x += kIconSize;
-      x += views::kPanelHorizMargin;
-
-      heading_->SetX(x);
-      heading_->SetY(y);
-    }
-  }
-
-  ExtensionUninstallDialog::Delegate* delegate_;
   views::ImageView* icon_;
   views::Label* heading_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialogView);
+  DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialogDelegateView);
 };
 
-}  // namespace
+ExtensionUninstallDialogViews::ExtensionUninstallDialogViews(
+    Profile* profile, ExtensionUninstallDialog::Delegate* delegate)
+    : ExtensionUninstallDialog(profile, delegate) {}
 
-// static
-void ExtensionUninstallDialog::Show(
-    Profile* profile,
-    ExtensionUninstallDialog::Delegate* delegate,
-    const Extension* extension,
-    SkBitmap* icon) {
-  Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
+ExtensionUninstallDialogViews::~ExtensionUninstallDialogViews() {
+  // Close the widget (the views framework will delete view_).
+  if (view_) {
+    view_->DialogDestroyed();
+    view_->GetWidget()->CloseNow();
+  }
+}
+
+void ExtensionUninstallDialogViews::Show() {
+  Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
   if (!browser) {
-    delegate->ExtensionDialogCanceled();
+    delegate_->ExtensionUninstallCanceled();
     return;
   }
 
   BrowserWindow* window = browser->window();
   if (!window) {
-    delegate->ExtensionDialogCanceled();
+    delegate_->ExtensionUninstallCanceled();
     return;
   }
 
-  browser::CreateViewsWindow(window->GetNativeHandle(),
-      new ExtensionUninstallDialogView(delegate, extension, icon))->Show();
+  view_ = new ExtensionUninstallDialogDelegateView(this, extension_, &icon_);
+  browser::CreateViewsWindow(window->GetNativeHandle(), view_)->Show();
+}
+
+void ExtensionUninstallDialogViews::ExtensionUninstallAccepted() {
+  // The widget gets destroyed when the dialog is accepted.
+  view_ = NULL;
+  delegate_->ExtensionUninstallAccepted();
+}
+
+void ExtensionUninstallDialogViews::ExtensionUninstallCanceled() {
+  // The widget gets destroyed when the dialog is canceled.
+  view_ = NULL;
+  delegate_->ExtensionUninstallCanceled();
+}
+
+ExtensionUninstallDialogDelegateView::ExtensionUninstallDialogDelegateView(
+    ExtensionUninstallDialogViews* dialog_view,
+    const Extension* extension,
+    SkBitmap* icon)
+    : dialog_(dialog_view) {
+  // Scale down to icon size, but allow smaller icons (don't scale up).
+  gfx::Size size(icon->width(), icon->height());
+  if (size.width() > kIconSize || size.height() > kIconSize)
+    size = gfx::Size(kIconSize, kIconSize);
+  icon_ = new views::ImageView();
+  icon_->SetImageSize(size);
+  icon_->SetImage(*icon);
+  AddChildView(icon_);
+
+  heading_ = new views::Label(UTF16ToWide(
+      l10n_util::GetStringFUTF16(IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,
+                                 UTF8ToUTF16(extension->name()))));
+  heading_->SetMultiLine(true);
+  AddChildView(heading_);
+}
+
+ExtensionUninstallDialogDelegateView::~ExtensionUninstallDialogDelegateView() {
+}
+
+std::wstring ExtensionUninstallDialogDelegateView::GetDialogButtonLabel(
+    MessageBoxFlags::DialogButton button) const {
+  switch (button) {
+    case MessageBoxFlags::DIALOGBUTTON_OK:
+      return UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON));
+    case MessageBoxFlags::DIALOGBUTTON_CANCEL:
+      return UTF16ToWide(l10n_util::GetStringUTF16(IDS_CANCEL));
+    default:
+      NOTREACHED();
+      return L"";
+  }
+}
+
+bool ExtensionUninstallDialogDelegateView::Accept() {
+  if (dialog_)
+    dialog_->ExtensionUninstallAccepted();
+  return true;
+}
+
+bool ExtensionUninstallDialogDelegateView::Cancel() {
+  if (dialog_)
+    dialog_->ExtensionUninstallCanceled();
+  return true;
+}
+
+std::wstring ExtensionUninstallDialogDelegateView::GetWindowTitle() const {
+  return UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_EXTENSION_UNINSTALL_PROMPT_TITLE));
+}
+
+
+gfx::Size ExtensionUninstallDialogDelegateView::GetPreferredSize() {
+  int width = kRightColumnWidth;
+  width += kIconSize;
+  width += views::kPanelHorizMargin * 3;
+
+  int height = views::kPanelVertMargin * 2;
+  height += heading_->GetHeightForWidth(kRightColumnWidth);
+
+  return gfx::Size(width,
+                   std::max(height, kIconSize + views::kPanelVertMargin * 2));
+}
+
+void ExtensionUninstallDialogDelegateView::Layout() {
+  int x = views::kPanelHorizMargin;
+  int y = views::kPanelVertMargin;
+
+  heading_->SizeToFit(kRightColumnWidth);
+
+  if (heading_->height() <= kIconSize) {
+    icon_->SetBounds(x, y, kIconSize, kIconSize);
+    x += kIconSize;
+    x += views::kPanelHorizMargin;
+
+    heading_->SetX(x);
+    heading_->SetY(y + (kIconSize - heading_->height()) / 2);
+  } else {
+    icon_->SetBounds(x,
+                     y + (heading_->height() - kIconSize) / 2,
+                     kIconSize,
+                     kIconSize);
+    x += kIconSize;
+    x += views::kPanelHorizMargin;
+
+    heading_->SetX(x);
+    heading_->SetY(y);
+  }
+}
+
+}  // namespace
+
+// static
+ExtensionUninstallDialog* ExtensionUninstallDialog::Create(
+    Profile* profile, Delegate* delegate) {
+  return new ExtensionUninstallDialogViews(profile, delegate);
 }

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

@@ -642,9 +642,9 @@ void AppLauncherHandler::HandleUninstallApp(const ListValue* args) {
     scoped_ptr<AutoReset<bool> > auto_reset;
     if (NewTabUI::NTP4Enabled())
       auto_reset.reset(new AutoReset<bool>(&ignore_changes_, true));
-    ExtensionDialogAccepted();
+    ExtensionUninstallAccepted();
   } else {
-    GetExtensionUninstallDialog()->ConfirmUninstall(this, extension);
+    GetExtensionUninstallDialog()->ConfirmUninstall(extension);
   }
 }
 
@@ -913,7 +913,7 @@ void AppLauncherHandler::PromptToEnableApp(const std::string& extension_id) {
   GetExtensionInstallUI()->ConfirmReEnable(this, extension);
 }
 
-void AppLauncherHandler::ExtensionDialogAccepted() {
+void AppLauncherHandler::ExtensionUninstallAccepted() {
   // Do the uninstall work here.
   DCHECK(!extension_id_prompting_.empty());
 
@@ -930,7 +930,7 @@ void AppLauncherHandler::ExtensionDialogAccepted() {
   extension_id_prompting_ = "";
 }
 
-void AppLauncherHandler::ExtensionDialogCanceled() {
+void AppLauncherHandler::ExtensionUninstallCanceled() {
   extension_id_prompting_ = "";
 }
 
@@ -958,7 +958,7 @@ void AppLauncherHandler::InstallUIProceed() {
 }
 
 void AppLauncherHandler::InstallUIAbort(bool user_initiated) {
-  // We record the histograms here because ExtensionDialogCanceled is also
+  // We record the histograms here because ExtensionUninstallCanceled is also
   // called when the extension uninstall dialog is canceled.
   const Extension* extension =
       extension_service_->GetExtensionById(extension_id_prompting_, true);
@@ -968,13 +968,13 @@ void AppLauncherHandler::InstallUIAbort(bool user_initiated) {
   ExtensionService::RecordPermissionMessagesHistogram(
       extension, histogram_name.c_str());
 
-  ExtensionDialogCanceled();
+  ExtensionUninstallCanceled();
 }
 
 ExtensionUninstallDialog* AppLauncherHandler::GetExtensionUninstallDialog() {
   if (!extension_uninstall_dialog_.get()) {
     extension_uninstall_dialog_.reset(
-        new ExtensionUninstallDialog(Profile::FromWebUI(web_ui_)));
+        ExtensionUninstallDialog::Create(Profile::FromWebUI(web_ui_), this));
   }
   return extension_uninstall_dialog_.get();
 }

chrome/browser/ui/webui/ntp/app_launcher_handler.h

@@ -141,8 +141,8 @@ class AppLauncherHandler : public WebUIMessageHandler,
   void PromptToEnableApp(const std::string& extension_id);
 
   // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
   // ExtensionInstallUI::Delegate:
   virtual void InstallUIProceed() OVERRIDE;

chrome/browser/ui/webui/options/extension_settings_handler.cc

@@ -210,7 +210,7 @@ ExtensionUninstallDialog*
 ExtensionSettingsHandler::GetExtensionUninstallDialog() {
   if (!extension_uninstall_dialog_.get()) {
     extension_uninstall_dialog_.reset(
-        new ExtensionUninstallDialog(Profile::FromWebUI(web_ui_)));
+        ExtensionUninstallDialog::Create(Profile::FromWebUI(web_ui_), this));
   }
   return extension_uninstall_dialog_.get();
 }
@@ -345,10 +345,10 @@ void ExtensionSettingsHandler::HandleUninstallMessage(const ListValue* args) {
 
   extension_id_prompting_ = extension_id;
 
-  GetExtensionUninstallDialog()->ConfirmUninstall(this, extension);
+  GetExtensionUninstallDialog()->ConfirmUninstall(extension);
 }
 
-void ExtensionSettingsHandler::ExtensionDialogAccepted() {
+void ExtensionSettingsHandler::ExtensionUninstallAccepted() {
   DCHECK(!extension_id_prompting_.empty());
 
   bool was_terminated = false;
@@ -376,7 +376,7 @@ void ExtensionSettingsHandler::ExtensionDialogAccepted() {
     HandleRequestExtensionsData(NULL);
 }
 
-void ExtensionSettingsHandler::ExtensionDialogCanceled() {
+void ExtensionSettingsHandler::ExtensionUninstallCanceled() {
   extension_id_prompting_ = "";
 }
 

chrome/browser/ui/webui/options/extension_settings_handler.h

@@ -145,8 +145,8 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler,
 
   // ExtensionUninstallDialog::Delegate implementation, used for receiving
   // notification about uninstall confirmation dialog selections.
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   // Helper that lists the current active html pages for an extension.

views/window/dialog_delegate.h

@@ -87,11 +87,10 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
   // For Dialog boxes, this is called when the user presses the "OK" button,
   // or the Enter key.  Can also be called on Esc key or close button
   // presses if there is no "Cancel" button.  This function should return
-  // true if the window can be closed after the window can be closed after
-  // it returns, or false if it must remain open.  If |window_closing| is
-  // true, it means that this handler is being called because the window is
-  // being closed (e.g.  by Window::Close) and there is no Cancel handler,
-  // so Accept is being called instead.
+  // true if the window can be closed after it returns, or false if it must
+  // remain open.  If |window_closing| is true, it means that this handler is
+  // being called because the window is being closed (e.g.  by Window::Close)
+  // and there is no Cancel handler, so Accept is being called instead.
   virtual bool Accept(bool window_closing);
   virtual bool Accept();