Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(523)

Unified Diff: chrome/browser/ui/panels/panel_settings_menu_model.cc

Issue 7920023: Fix crashes related to the extension uninstall dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make Show() pure virtual Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_settings_menu_model.cc
diff --git a/chrome/browser/ui/panels/panel_settings_menu_model.cc b/chrome/browser/ui/panels/panel_settings_menu_model.cc
index 5be91bef6d845ec5da46bb00db2be7a4bded7c77..a283a73820a6c5d7bd3cdbbe325d196b9dcb570a 100644
--- a/chrome/browser/ui/panels/panel_settings_menu_model.cc
+++ b/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() {
}

Powered by Google App Engine
This is Rietveld 408576698