Update extension install prompt to reflect withheld permissions

chrome/browser/extensions/external_install_error.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/external_install_error.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 185 matching lines @@
       gfx::Size(extension_misc::EXTENSION_ICON_SMALL,
                 extension_misc::EXTENSION_ICON_SMALL)));
 }
 
 base::string16 ExternalInstallBubbleAlert::GetBubbleViewTitle() {
   return prompt_->GetDialogTitle();
 }
 
 std::vector<base::string16>
 ExternalInstallBubbleAlert::GetBubbleViewMessages() {
+  ExtensionInstallPrompt::PermissionsType regular_permissions =
+      ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
+  ExtensionInstallPrompt::PermissionsType withheld_permissions =
+      ExtensionInstallPrompt::PermissionsType::WITHHELD_PERMISSIONS;
+
   std::vector<base::string16> messages;
   messages.push_back(prompt_->GetHeading());
-  if (prompt_->GetPermissionCount()) {
-    messages.push_back(prompt_->GetPermissionsHeading());
-    for (size_t i = 0; i < prompt_->GetPermissionCount(); ++i) {
+  if (prompt_->GetPermissionCount(regular_permissions)) {
+    messages.push_back(prompt_->GetPermissionsHeading(regular_permissions));
+    for (size_t i = 0; i < prompt_->GetPermissionCount(regular_permissions);
+         ++i) {
       messages.push_back(l10n_util::GetStringFUTF16(
-          IDS_EXTENSION_PERMISSION_LINE, prompt_->GetPermission(i)));
+          IDS_EXTENSION_PERMISSION_LINE,
+          prompt_->GetPermission(i, regular_permissions)));
+    }
+  }
+  if (prompt_->GetPermissionCount(withheld_permissions)) {
+    messages.push_back(prompt_->GetPermissionsHeading(withheld_permissions));
+    for (size_t i = 0; i < prompt_->GetPermissionCount(withheld_permissions);
+         ++i) {
+      messages.push_back(l10n_util::GetStringFUTF16(
+          IDS_EXTENSION_PERMISSION_LINE,
+          prompt_->GetPermission(i, withheld_permissions)));

[gpdavis, 2014/09/08 20:07:05]

Do you think this warrants some sort of loop to reduce duplicated code?  This
seemed like the cleanest way to reflect withheld permissions to me.

[Devlin, 2014/09/09 15:53:21]

Yeah, I was wondering if it would... but I think it's probably okay.  Even
though it's a few lines, it's really only two function calls, so it's not as
prone to breaking.

[gpdavis, 2014/09/09 17:32:41]

Sweet.

     }
   }
   // TODO(yoz): OAuth issue advice?
   return messages;
 }
 
 base::string16 ExternalInstallBubbleAlert::GetBubbleViewAcceptButtonLabel() {
   return prompt_->GetAcceptButtonLabel();
 }
 
@@ skipping 156 matching lines @@
     if (browser)
       global_error_->ShowBubbleView(browser);
   } else {
     DCHECK(alert_type_ == MENU_ALERT);
     global_error_.reset(new ExternalInstallMenuAlert(this));
     error_service_->AddGlobalError(global_error_.get());
   }
 }
 
 }  // namespace extensions