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 ae6145b1f4f601d4e27381e4dcb4f9dc768b09d2..d345249e53ac80a1379be030e979a086e8638c75 100644 |
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc |
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc |
@@ -434,10 +434,12 @@ ExtensionResource ExtensionsDOMHandler::PickExtensionIcon( |
ExtensionIconSet::MATCH_BIGGER); |
} |
-ExtensionInstallUI* ExtensionsDOMHandler::GetExtensionInstallUI() { |
- if (!install_ui_.get()) |
- install_ui_.reset(new ExtensionInstallUI(web_ui_->GetProfile())); |
- return install_ui_.get(); |
+ExtensionGenericDialog* ExtensionsDOMHandler::GetExtensionGenericDialog() { |
+ if (!extension_generic_dialog_.get()) { |
+ extension_generic_dialog_.reset( |
+ new ExtensionGenericDialog(web_ui_->GetProfile())); |
+ } |
+ return extension_generic_dialog_.get(); |
} |
void ExtensionsDOMHandler::HandleToggleDeveloperMode(const ListValue* args) { |
@@ -545,10 +547,10 @@ void ExtensionsDOMHandler::HandleUninstallMessage(const ListValue* args) { |
extension_id_prompting_ = extension_id; |
- GetExtensionInstallUI()->ConfirmUninstall(this, extension); |
+ GetExtensionGenericDialog()->ConfirmUninstall(this, extension); |
} |
-void ExtensionsDOMHandler::InstallUIProceed() { |
+void ExtensionsDOMHandler::ExtensionDialogAccepted() { |
DCHECK(!extension_id_prompting_.empty()); |
bool was_terminated = false; |
@@ -575,7 +577,7 @@ void ExtensionsDOMHandler::InstallUIProceed() { |
HandleRequestExtensionsData(NULL); |
} |
-void ExtensionsDOMHandler::InstallUIAbort() { |
+void ExtensionsDOMHandler::ExtensionDialogCanceled() { |
extension_id_prompting_ = ""; |
} |