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

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

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest master Created 6 years, 6 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/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()) {
« no previous file with comments | « chrome/browser/extensions/extension_gcm_app_handler.cc ('k') | chrome/browser/extensions/extension_keybinding_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698