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

Unified Diff: chrome/browser/ui/webui/options/extension_settings_handler.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
« no previous file with comments | « chrome/browser/ui/webui/options/extension_settings_handler.h ('k') | views/window/dialog_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index a9cd9005595c5f73a70f9060da0ca47eee6bb0ff..40da804351463c8821288e153fde7cb232228b95 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/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_ = "";
}
« no previous file with comments | « chrome/browser/ui/webui/options/extension_settings_handler.h ('k') | views/window/dialog_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698