| Index: chrome/browser/extensions/extension_install_prompt.cc
|
| diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
|
| index f02d35a8e7949c7cde91228bc3ca1538bd0a740a..ca5f86a6da7c880cf09fd000f142d65d0fd48a7c 100644
|
| --- a/chrome/browser/extensions/extension_install_prompt.cc
|
| +++ b/chrome/browser/extensions/extension_install_prompt.cc
|
| @@ -708,18 +708,21 @@ void ExtensionInstallPrompt::ShowConfirmation() {
|
| else
|
| prompt_.set_experiment(ExtensionInstallPromptExperiment::ControlGroup());
|
|
|
| - if (permissions_.get() &&
|
| - (!extension_ ||
|
| - !extensions::PermissionsData::ShouldSkipPermissionWarnings(
|
| - extension_))) {
|
| - Manifest::Type extension_type = extension_ ?
|
| - extension_->GetType() : Manifest::TYPE_UNKNOWN;
|
| - prompt_.SetPermissions(
|
| - extensions::PermissionMessageProvider::Get()->
|
| - GetWarningMessages(permissions_, extension_type));
|
| - prompt_.SetPermissionsDetails(
|
| - extensions::PermissionMessageProvider::Get()->
|
| - GetWarningMessagesDetails(permissions_, extension_type));
|
| + if (permissions_.get()) {
|
| + if (extension_) {
|
| + const extensions::PermissionsData* permissions_data =
|
| + extensions::PermissionsData::ForExtension(extension_);
|
| + prompt_.SetPermissions(permissions_data->GetPermissionMessageStrings());
|
| + prompt_.SetPermissionsDetails(
|
| + permissions_data->GetPermissionMessageDetailsStrings());
|
| + } else {
|
| + const extensions::PermissionMessageProvider* message_provider =
|
| + extensions::PermissionMessageProvider::Get();
|
| + prompt_.SetPermissions(message_provider->GetWarningMessages(
|
| + permissions_, Manifest::TYPE_UNKNOWN));
|
| + prompt_.SetPermissionsDetails(message_provider->GetWarningMessagesDetails(
|
| + permissions_, Manifest::TYPE_UNKNOWN));
|
| + }
|
| }
|
|
|
| switch (prompt_.type()) {
|
|
|