Index: chrome/browser/extensions/crx_installer.cc |
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc |
index e51b225e73cc7387a1d99a46ae2642909fd82dcb..1a1789e6c10d3110f558ea2615883b0dc8f3c72d 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_dialog.h" |
#include "chrome/browser/extensions/extension_install_ui.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/extension_system.h" |
@@ -124,6 +125,10 @@ CrxInstaller::CrxInstaller( |
expected_id_ = approval->extension_id; |
record_oauth2_grant_ = approval->record_oauth2_grant; |
} |
+ |
+ dialog_ = approval->dialog_; |
+ if (!dialog_.get()) |
+ dialog_ = ExtensionInstallDialog::CreateDefaultImpl(); |
} |
CrxInstaller::~CrxInstaller() { |
@@ -453,7 +458,7 @@ void CrxInstaller::ConfirmInstall() { |
if (client_ && (!allow_silent_install_ || !approved_)) { |
AddRef(); // Balanced in Proceed() and Abort(). |
- client_->ConfirmInstall(this, extension_.get()); |
+ client_->ConfirmInstall(this, extension_.get(), dialog_); |
} else { |
if (!BrowserThread::PostTask( |
BrowserThread::FILE, FROM_HERE, |