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

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

Issue 10399069: Reland 137540 - Disable off-store extension installs by default. Also get rid of ExtensionService::… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 336963bac8a78addf07a093db2206c7636e011a3..687a7775bb5547a69e6b14a78c0621e624df763e 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -86,15 +86,16 @@ CrxInstaller::CrxInstaller(base::WeakPtr<ExtensionService> frontend_weak,
return;
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);
- // Mark the extension as approved, but save the expected manifest and ID
- // so we can check that they match the CRX's.
- approved_ = true;
- expected_manifest_.reset(approval->parsed_manifest->DeepCopy());
- expected_id_ = approval->extension_id;
+ if (approval->skip_install_dialog) {
+ // Mark the extension as approved, but save the expected manifest and ID
+ // so we can check that they match the CRX's.
+ approved_ = true;
+ expected_manifest_.reset(approval->parsed_manifest->DeepCopy());
+ expected_id_ = approval->extension_id;
+ }
}
CrxInstaller::~CrxInstaller() {
« no previous file with comments | « chrome/browser/extensions/bundle_installer.cc ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698