| Index: chrome/browser/extensions/extensions_ui.cc
|
| diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
|
| index ca435f7930d8a7e53aceb80cfea017b65b63351d..07e21c502172e36a92abe8c1e7592196d5d64704 100644
|
| --- a/chrome/browser/extensions/extensions_ui.cc
|
| +++ b/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_ = "";
|
| }
|
|
|
|
|