diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 18:47:09 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 18:47:09 +0000 |
| commit | 89019d6a0e32e517da3aa7f84125ff3bcd69109f (patch) | |
| tree | 347077013bafbd85fbbdd81d524f3a5434b537f4 /chrome/browser/extensions/bundle_installer.cc | |
| parent | 036240c0388b24d480f93f3c02044b221aa7620a (diff) | |
| download | chromium_src-89019d6a0e32e517da3aa7f84125ff3bcd69109f.zip chromium_src-89019d6a0e32e517da3aa7f84125ff3bcd69109f.tar.gz chromium_src-89019d6a0e32e517da3aa7f84125ff3bcd69109f.tar.bz2 | |
Reland 137540 - Disable off-store extension installs by default. Also get rid of ExtensionService::IsDownloadFromGallery."
This removes a pyauto test that was failing. The test needs
to be different depending on whether a feature is on or off,
but there's currently no good way to test whether a feature
is enabled from pyauto.
BUG=55584
TBR=mpcomplete@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10399069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/bundle_installer.cc')
| -rw-r--r-- | chrome/browser/extensions/bundle_installer.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/bundle_installer.cc b/chrome/browser/extensions/bundle_installer.cc index 174eaa5..e7ffe37 100644 --- a/chrome/browser/extensions/bundle_installer.cc +++ b/chrome/browser/extensions/bundle_installer.cc @@ -156,10 +156,11 @@ void BundleInstaller::CompleteInstall(NavigationController* controller, // Since we've already confirmed the permissions, create an approval that // lets CrxInstaller bypass the prompt. scoped_ptr<WebstoreInstaller::Approval> approval( - new WebstoreInstaller::Approval); - approval->extension_id = i->first; - approval->profile = profile_; - approval->parsed_manifest.reset(parsed_manifests_[i->first]->DeepCopy()); + WebstoreInstaller::Approval::CreateWithNoInstallPrompt( + profile_, + i->first, + scoped_ptr<base::DictionaryValue>( + parsed_manifests_[i->first]->DeepCopy()))); approval->use_app_installed_bubble = false; approval->skip_post_install_ui = true; |