Index: chrome/browser/extensions/crx_installer.cc |
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc |
index 4a26f21d9a734f0fd8bb9fa0d7afe94c786f2bb3..7e52cc0006deb05dff215e1220c1e6e15b836c73 100644 |
--- a/chrome/browser/extensions/crx_installer.cc |
+++ b/chrome/browser/extensions/crx_installer.cc |
@@ -25,6 +25,7 @@ |
#include "chrome/browser/extensions/convert_web_app.h" |
#include "chrome/browser/extensions/default_apps_trial.h" |
#include "chrome/browser/extensions/extension_error_reporter.h" |
+#include "chrome/browser/extensions/extension_install_ui.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/permissions_updater.h" |
#include "chrome/browser/extensions/webstore_installer.h" |
@@ -55,20 +56,20 @@ using extensions::PermissionsUpdater; |
// static |
scoped_refptr<CrxInstaller> CrxInstaller::Create( |
ExtensionService* frontend, |
- ExtensionInstallUI* client) { |
+ ExtensionInstallPrompt* client) { |
return new CrxInstaller(frontend->AsWeakPtr(), client, NULL); |
} |
// static |
scoped_refptr<CrxInstaller> CrxInstaller::Create( |
ExtensionService* frontend, |
- ExtensionInstallUI* client, |
+ ExtensionInstallPrompt* client, |
const WebstoreInstaller::Approval* approval) { |
return new CrxInstaller(frontend->AsWeakPtr(), client, approval); |
} |
CrxInstaller::CrxInstaller(base::WeakPtr<ExtensionService> frontend_weak, |
- ExtensionInstallUI* client, |
+ ExtensionInstallPrompt* client, |
const WebstoreInstaller::Approval* approval) |
: install_directory_(frontend_weak->install_directory()), |
install_source_(Extension::INTERNAL), |
@@ -88,7 +89,7 @@ CrxInstaller::CrxInstaller(base::WeakPtr<ExtensionService> frontend_weak, |
CHECK(profile_->IsSameProfile(approval->profile)); |
client_->set_use_app_installed_bubble(approval->use_app_installed_bubble); |
- client_->set_skip_post_install_ui(approval->skip_post_install_ui); |
+ client_->SetSkipPostInstallUI(approval->skip_post_install_ui); |
if (approval->skip_install_dialog) { |
// Mark the extension as approved, but save the expected manifest and ID |
@@ -488,7 +489,7 @@ void CrxInstaller::ReportFailureFromUIThread(const string16& error) { |
ExtensionErrorReporter::GetInstance()->ReportError(error, false); // quiet |
if (client_) |
- client_->OnInstallFailure(error); |
+ client_->install_ui()->OnInstallFailure(error); |
NotifyCrxInstallComplete(NULL); |
} |
@@ -523,8 +524,10 @@ void CrxInstaller::ReportSuccessFromUIThread() { |
return; |
// If there is a client, tell the client about installation. |
- if (client_) |
- client_->OnInstallSuccess(extension_.get(), install_icon_.get()); |
+ if (client_) { |
+ client_->install_ui()->OnInstallSuccess( |
+ extension_.get(), install_icon_.get()); |
+ } |
// We update the extension's granted permissions if the user already approved |
// the install (client_ is non NULL), or we are allowed to install this |