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

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

Issue 2858013002: PS - Showing permission prompt for activeTab (Closed)
Patch Set: Update a unittest (.mm) Created 3 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/extension_install_prompt.cc
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index d691a713a57c40fbdb097d1eddc5fe7bbf9790a5..dcd7117dcb9a64cd3bf0915eaae2119f7fb56315 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -161,16 +161,12 @@ ExtensionInstallPrompt::Prompt::Prompt(PromptType type)
ExtensionInstallPrompt::Prompt::~Prompt() {
}
-void ExtensionInstallPrompt::Prompt::SetPermissions(
+void ExtensionInstallPrompt::Prompt::AddPermissions(
const PermissionMessages& permissions,
PermissionsType permissions_type) {
InstallPromptPermissions& install_permissions =
GetPermissionsForType(permissions_type);
- install_permissions.permissions.clear();
- install_permissions.details.clear();
- install_permissions.is_showing_details.clear();
-
for (const PermissionMessage& msg : permissions) {
install_permissions.permissions.push_back(msg.message());
// Add a dash to the front of each permission detail.
@@ -792,7 +788,7 @@ void ExtensionInstallPrompt::ShowConfirmation() {
const extensions::PermissionMessageProvider* message_provider =
extensions::PermissionMessageProvider::Get();
- prompt_->SetPermissions(message_provider->GetPermissionMessages(
+ prompt_->AddPermissions(message_provider->GetPermissionMessages(
message_provider->GetAllPermissionIDs(
*permissions_to_display, type)),
REGULAR_PERMISSIONS);
@@ -801,7 +797,7 @@ void ExtensionInstallPrompt::ShowConfirmation() {
extension_ ? &extension_->permissions_data()->withheld_permissions()
: nullptr;
if (withheld && !withheld->IsEmpty()) {
- prompt_->SetPermissions(
+ prompt_->AddPermissions(
message_provider->GetPermissionMessages(
message_provider->GetAllPermissionIDs(*withheld, type)),
WITHHELD_PERMISSIONS);

Powered by Google App Engine
This is Rietveld 408576698