Update app info and install prompt UI to show retained devices.

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 172 matching lines @@
                  prompt:(scoped_refptr<ExtensionInstallPrompt::Prompt>)prompt {
   // We use a different XIB in the case of bundle installs, installs with
   // webstore data, or no permission warnings. These are laid out nicely for
   // the data they display.
   NSString* nibName = nil;
   if (prompt->type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT) {
     nibName = @"ExtensionInstallPromptBundle";
   } else if (prompt->has_webstore_data()) {
     nibName = @"ExtensionInstallPromptWebstoreData";
   } else if (!prompt->ShouldShowPermissions() &&
-             prompt->GetRetainedFileCount() == 0) {
+             prompt->GetRetainedFileCount() == 0 &&
+             prompt->GetRetainedDeviceCount() == 0) {
     nibName = @"ExtensionInstallPromptNoWarnings";
   } else {
     nibName = @"ExtensionInstallPrompt";
   }
 
   if ((self = [super initWithNibName:nibName
                               bundle:base::mac::FrameworkBundle()])) {
     navigator_ = navigator;
     delegate_ = delegate;
     prompt_ = prompt;
@@ skipping 96 matching lines @@
         [joinedItems appendString:@"\n"];
       [joinedItems appendString:base::SysUTF16ToNSString(
           items[i].GetNameForDisplay())];
     }
     [itemsField_ setStringValue:joinedItems];
 
     // Adjust the controls to fit the list of extensions.
     OffsetControlVerticallyToFitContent(itemsField_, &totalOffset);
   }
 
-  // If there are any warnings or retained files, then we have to do
-  // some special layout.
+  // If there are any warnings, retained devices or retained files, then we
+  // have to do some special layout.
   if (prompt_->ShouldShowPermissions() || prompt_->GetRetainedFileCount() > 0) {
     NSSize spacing = [outlineView_ intercellSpacing];
     spacing.width += 2;
     spacing.height += 2;
     [outlineView_ setIntercellSpacing:spacing];
     [[[[outlineView_ tableColumns] objectAtIndex:0] dataCell] setWraps:YES];
     for (id item in warnings_.get())
       [self expandItemAndChildren:item];
 
     // Adjust the outline view to fit the warnings.
@@ skipping 334 matching lines @@
         [self buildItemWithTitle:SysUTF16ToNSString(
             prompt.GetRetainedFilesHeading())
                   cellAttributes:kBoldText | kAutoExpandCell | kNoExpandMarker
                         children:children]];
 
     // Add a row for the link.
     [warnings addObject:
         [self buildDetailToggleItem:type permissionsDetailIndex:0]];
   }
 
+  if (prompt.GetRetainedDeviceCount() > 0) {
+    type = ExtensionInstallPrompt::RETAINED_DEVICES_DETAILS;

[tapted, 2014/09/19 04:09:09]

What happens if an extension has both retained devices and retained files?

[Reilly Grant (use Gerrit), 2014/09/19 19:30:09]

You get two lists and the button says "Revoke File and Device Access".

[tapted, 2014/09/22 01:04:36]

Ah - cool. On the cocoa side it looked like `type` was getting clobbered if it
was previously set in the previous `if` block as well. It's not clear that it's
essentially unused after each call to -[warnings addObject:..]

An improvement to reduce confusion might be to redeclare `type` inside each
block . i.e.

  ExtensionInstallPrompt::DetailsType type =
      ExtensionInstallPrompt::PERMISSIONS_DETAILS;
  if (prompt.ShouldShowPermissions()) {
    NSMutableArray* children = [NSMutableArray array];
    ...

could become

  if (prompt.ShouldShowPermissions()) {
    const ExtensionInstallPrompt::DetailsType type =
        ExtensionInstallPrompt::PERMISSIONS_DETAILS;
    NSMutableArray* children = [NSMutableArray array];
    ...


But this is OK too - I just need to expand my diff a bit more :)

+
+    NSMutableArray* children = [NSMutableArray array];
+
+    if (prompt.GetIsShowingDetails(type, 0)) {
+      for (size_t i = 0; i < prompt.GetRetainedDeviceCount(); ++i) {
+        [children

[tapted, 2014/09/19 04:09:09]

nit: a temporary `title` var will probably make this wrapping more sane. i.e.

      NSString* title =
          SysUTF16ToNSString(prompt.GetRetainedDeviceMessageString(i));
      [children addObject:[self buildItemWithTitle:title
                                    cellAttributes:kUseBullet
                                          children:nil]];

[Reilly Grant (use Gerrit), 2014/09/19 19:30:09]

Done.

+            addObject:[self buildItemWithTitle:
+                                SysUTF16ToNSString(
+                                    prompt.GetRetainedDeviceMessageString(i))
+                                cellAttributes:kUseBullet
+                                      children:nil]];
+      }
+    }
+
+    [warnings

[tapted, 2014/09/19 04:09:09]

same here, clang-format will probably do something like

    NSString* title = SysUTF16ToNSString(prompt.GetRetainedDevicesHeading());
    [warnings addObject:[self buildItemWithTitle:title
                                  cellAttributes:kBoldText | kAutoExpandCell |
                                                 kNoExpandMarker
                                        children:children]];

+        addObject:[self
+                      buildItemWithTitle:SysUTF16ToNSString(
+                                             prompt.GetRetainedDevicesHeading())
+                          cellAttributes:kBoldText | kAutoExpandCell |
+                                         kNoExpandMarker
+                                children:children]];
+
+    // Add a row for the link.
+    [warnings
+        addObject:[self buildDetailToggleItem:type permissionsDetailIndex:0]];
+  }
+
   return warnings;
 }
 
 - (void)updateViewFrame:(NSRect)frame {
   NSWindow* window = [[self view] window];
   [window setFrame:[window frameRectForContentRect:frame] display:YES];
   [[self view] setFrame:frame];
 }
 
 @end
@@ skipping 58 matching lines @@
 }
 
 - (void)accessibilityPerformAction:(NSString*)action {
   if ([action isEqualToString:NSAccessibilityPressAction])
     [self handleLinkClicked];
   else
     [super accessibilityPerformAction:action];
 }
 
 @end