Update extension install prompt to reflect withheld permissions

chrome/browser/extensions/external_install_error.cc

Index: chrome/browser/extensions/external_install_error.cc
diff --git a/chrome/browser/extensions/external_install_error.cc b/chrome/browser/extensions/external_install_error.cc
index c01e8da854fac0db1f97bc682bc7eb487222a13e..d93b714b0cc835740d64c1703248eca5d56888b6 100644
--- a/chrome/browser/extensions/external_install_error.cc
+++ b/chrome/browser/extensions/external_install_error.cc
@@ -203,13 +203,29 @@ base::string16 ExternalInstallBubbleAlert::GetBubbleViewTitle() {
 
 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, 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)));
+          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?