Update extension install prompt to reflect withheld permissions

chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/i18n/rtl.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
@@ skipping 574 matching lines @@
     kCellAttributesKey : [NSNumber numberWithInt:kUseCustomLinkCell |
                                                  kNoExpandMarker],
     kPermissionsDetailIndex : [NSNumber numberWithUnsignedInteger:index],
     kPermissionsDetailType : [NSNumber numberWithUnsignedInteger:type],
   };
 }
 
 - (NSArray*)buildWarnings:(const ExtensionInstallPrompt::Prompt&)prompt {
   NSMutableArray* warnings = [NSMutableArray array];
   NSString* heading = nil;
+  NSString* withheld_heading = nil;
 
   ExtensionInstallPrompt::DetailsType type =
       ExtensionInstallPrompt::PERMISSIONS_DETAILS;
   if (prompt.ShouldShowPermissions()) {
     NSMutableArray* children = [NSMutableArray array];
-    if (prompt.GetPermissionCount() > 0) {
-      for (size_t i = 0; i < prompt.GetPermissionCount(); ++i) {
-        [children addObject:
-            [self buildItemWithTitle:SysUTF16ToNSString(prompt.GetPermission(i))
-                      cellAttributes:kUseBullet
-                            children:nil]];
+    NSMutableArray* withheld_children = [NSMutableArray array];
+
+    ExtensionInstallPrompt::PermissionsType type =
+        ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
+    size_t permissions_count = prompt.GetPermissionCount(type);
+    if (permissions_count > 0) {
+      for (size_t i = 0; i < permissions_count; ++i) {
+        [children addObject:[self buildItemWithTitle:SysUTF16ToNSString(
+                                                         prompt.GetPermission(
+                                                             i, type))
+                                      cellAttributes:kUseBullet
+                                            children:nil]];
 
         // If there are additional details, add them below this item.
-        if (!prompt.GetPermissionsDetails(i).empty()) {
+        if (!prompt.GetPermissionsDetails(i, type).empty()) {
           if (prompt.GetIsShowingDetails(
               ExtensionInstallPrompt::PERMISSIONS_DETAILS, i)) {
-            [children addObject:
-                [self buildItemWithTitle:SysUTF16ToNSString(
-                    prompt.GetPermissionsDetails(i))
-                          cellAttributes:kNoExpandMarker
-                                children:nil]];
+            [children
+                addObject:[self buildItemWithTitle:
+                                    SysUTF16ToNSString(
+                                        prompt.GetPermissionsDetails(i, type))
+                                    cellAttributes:kNoExpandMarker
+                                          children:nil]];
           }
 
           // Add a row for the link.
           [children addObject:
               [self buildDetailToggleItem:type permissionsDetailIndex:i]];
         }
       }
 
-      heading = SysUTF16ToNSString(prompt.GetPermissionsHeading());
-    } else {
+      heading = SysUTF16ToNSString(prompt.GetPermissionsHeading(type));
+    }
+
+    type = ExtensionInstallPrompt::PermissionsType::WITHHELD_PERMISSIONS;
+    size_t withheld_permissions_count = prompt.GetPermissionCount(type);
+    if (withheld_permissions_count > 0) {
+      for (size_t i = 0; i < withheld_permissions_count; ++i) {
+        [withheld_children
+            addObject:[self
+                          buildItemWithTitle:SysUTF16ToNSString(
+                                                 prompt.GetPermission(i, type))
+                              cellAttributes:kUseBullet
+                                    children:nil]];
+
+        // If there are additional details, add them below this item.
+        if (!prompt.GetPermissionsDetails(i, type).empty()) {
+          if (prompt.GetIsShowingDetails(
+                  ExtensionInstallPrompt::WITHHELD_PERMISSIONS_DETAILS, i)) {

[Devlin, 2014/09/04 22:06:09]

It looks like a helper function might be in order here. :)

[gpdavis, 2014/09/05 20:23:02]

Done.

+            [withheld_children
+                addObject:[self buildItemWithTitle:
+                                    SysUTF16ToNSString(
+                                        prompt.GetPermissionsDetails(i, type))
+                                    cellAttributes:kNoExpandMarker
+                                          children:nil]];
+          }
+
+          // Add a row for the link.
+          [withheld_children addObject:[self buildDetailToggleItem:type
+                                            permissionsDetailIndex:i]];
+        }
+      }
+
+      withheld_heading = SysUTF16ToNSString(prompt.GetPermissionsHeading(type));
+    }
+
+    if (permissions_count + withheld_permissions_count == 0) {
       [children addObject:
           [self buildItemWithTitle:
               l10n_util::GetNSString(IDS_EXTENSION_NO_SPECIAL_PERMISSIONS)
                     cellAttributes:kUseBullet
                           children:nil]];
       heading = @"";
     }
 
     [warnings addObject:[self
         buildItemWithTitle:heading
             cellAttributes:kBoldText | kAutoExpandCell | kNoExpandMarker
                   children:children]];
+
+    // Add withheld permissions to the prompt if they exist.
+    if (withheld_heading) {
+      [warnings addObject:[self buildItemWithTitle:withheld_heading
+                                    cellAttributes:kBoldText | kAutoExpandCell |
+                                                   kNoExpandMarker
+                                          children:withheld_children]];
+    }
   }
 
   if (prompt.GetRetainedFileCount() > 0) {
     type = ExtensionInstallPrompt::RETAINED_FILES_DETAILS;
 
     NSMutableArray* children = [NSMutableArray array];
 
     if (prompt.GetIsShowingDetails(type, 0)) {
       for (size_t i = 0; i < prompt.GetRetainedFileCount(); ++i) {
         [children addObject:
@@ skipping 86 matching lines @@
 }
 
 - (void)accessibilityPerformAction:(NSString*)action {
   if ([action isEqualToString:NSAccessibilityPressAction])
     [self handleLinkClicked];
   else
     [super accessibilityPerformAction:action];
 }
 
 @end