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

Unified Diff: chrome/browser/extensions/crx_installer.cc

Issue 11087071: Making ShowExtensionInstallDialog a callback (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
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,

Powered by Google App Engine
This is Rietveld 408576698