diff options
| author | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 21:19:03 +0000 |
|---|---|---|
| committer | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 21:19:03 +0000 |
| commit | b0d1d0b33f340f11b6d5f1d11eee74c89c4c87d3 (patch) | |
| tree | 4538c4edc6a6bb320570d14db2c001f7218ce32e /chrome/browser/extensions/extension_install_prompt.cc | |
| parent | 61e721640398e9027316f98d17320ec0f7f98a2b (diff) | |
| download | chromium_src-b0d1d0b33f340f11b6d5f1d11eee74c89c4c87d3.zip chromium_src-b0d1d0b33f340f11b6d5f1d11eee74c89c4c87d3.tar.gz chromium_src-b0d1d0b33f340f11b6d5f1d11eee74c89c4c87d3.tar.bz2 | |
Fix regression with permission warnings for trusted extensions.
BUG=None
TEST=Install trusted and untrusted extensions and verify there are no permission warnings for the trusted extension.
Review URL: https://chromiumcodereview.appspot.com/11363044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_install_prompt.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_install_prompt.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index fe6ce49..a9dfa32 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -605,7 +605,8 @@ void ExtensionInstallPrompt::OnMintTokenFailure( void ExtensionInstallPrompt::ShowConfirmation() { prompt_.set_type(prompt_type_); - if (permissions_) { + if (permissions_ && + (!extension_ || !extension_->ShouldSkipPermissionWarnings())) { Extension::Type extension_type = extension_ ? extension_->GetType() : Extension::TYPE_UNKNOWN; prompt_.SetPermissions(permissions_->GetWarningMessages(extension_type)); |