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

chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 455 matching lines @@
       layout->StartRow(0, column_set_id);
       views::Label* permission_label = new views::Label(
           l10n_util::GetStringUTF16(IDS_EXTENSION_NO_SPECIAL_PERMISSIONS));
       permission_label->SetMultiLine(true);
       permission_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       permission_label->SizeToFit(left_column_width);
       layout->AddView(permission_label);
     }
   }
 
-  if (prompt->GetRetainedFileCount()) {
-    // Slide in under the permissions, if there are any. If there are
-    // either, the retained files prompt stretches all the way to the
-    // right of the dialog. If there are no permissions, the retained
-    // files prompt just takes up the left column.
-    int space_for_files = left_column_width;
+  int space_for_files_and_devices = left_column_width;
+  if (prompt->GetRetainedFileCount() || prompt->GetRetainedDeviceCount()) {
+    // Slide in under the permissions, if there are any. If there are either,
+    // the retained files and devices prompts stretch all the way to the right
+    // of the dialog. If there are no permissions, the retained files and
+    // devices prompts just take up the left column.
+
     if (prompt->GetPermissionCount()) {
-      space_for_files += kIconSize;
+      space_for_files_and_devices += kIconSize;
       views::ColumnSet* column_set = layout->AddColumnSet(++column_set_id);
       column_set->AddColumn(views::GridLayout::FILL,
                             views::GridLayout::FILL,
                             1,
                             views::GridLayout::USE_PREF,
                             0,  // no fixed width
-                            space_for_files);
+                            space_for_files_and_devices);
     }
+  }
 
+  if (prompt->GetRetainedFileCount()) {
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
     layout->StartRow(0, column_set_id);
-    views::Label* retained_files_header = NULL;
-    retained_files_header = new views::Label(prompt->GetRetainedFilesHeading());
-    retained_files_header->SetMultiLine(true);
-    retained_files_header->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    retained_files_header->SizeToFit(space_for_files);
-    layout->AddView(retained_files_header);
+    views::Label* retained_header = NULL;
+    retained_header = new views::Label(prompt->GetRetainedFilesHeading());
+    retained_header->SetMultiLine(true);
+    retained_header->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    retained_header->SizeToFit(space_for_files_and_devices);
+    layout->AddView(retained_header);
 
     layout->StartRow(0, column_set_id);
     PermissionDetails details;
     for (size_t i = 0; i < prompt->GetRetainedFileCount(); ++i)
       details.push_back(prompt->GetRetainedFile(i));
     ExpandableContainerView* issue_advice_view =
-        new ExpandableContainerView(
-            this, base::string16(), details, space_for_files,
-            false, true, false);
+        new ExpandableContainerView(this,
+                                    base::string16(),
+                                    details,
+                                    space_for_files_and_devices,
+                                    false,
+                                    true,
+                                    false);
     layout->AddView(issue_advice_view);
   }
 
+  if (prompt->GetRetainedDeviceCount()) {
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+
+    layout->StartRow(0, column_set_id);
+    views::Label* retained_header = NULL;
+    retained_header = new views::Label(prompt->GetRetainedDevicesHeading());
+    retained_header->SetMultiLine(true);
+    retained_header->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    retained_header->SizeToFit(space_for_files_and_devices);
+    layout->AddView(retained_header);
+
+    layout->StartRow(0, column_set_id);
+    PermissionDetails details;
+    for (size_t i = 0; i < prompt->GetRetainedDeviceCount(); ++i)
+      details.push_back(prompt->GetRetainedDeviceMessageString(i));
+    ExpandableContainerView* issue_advice_view =
+        new ExpandableContainerView(this,
+                                    base::string16(),
+                                    details,
+                                    space_for_files_and_devices,
+                                    false,
+                                    true,
+                                    false);
+    layout->AddView(issue_advice_view);
+  }
+
   DCHECK(prompt->type() >= 0);
   UMA_HISTOGRAM_ENUMERATION("Extensions.InstallPrompt.Type",
                             prompt->type(),
                             ExtensionInstallPrompt::NUM_PROMPT_TYPES);
 
   if (prompt->ShouldShowPermissions()) {
     if (prompt->ShouldShowExplanationText()) {
       views::ColumnSet* column_set = layout->AddColumnSet(++column_set_id);
       column_set->AddColumn(views::GridLayout::LEADING,
                             views::GridLayout::FILL,
@@ skipping 554 matching lines @@
 void ExpandableContainerView::ExpandWithoutAnimation() {
   expanded_ = true;
   details_view_->AnimateToState(1.0);
 }
 
 // static
 ExtensionInstallPrompt::ShowDialogCallback
 ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
   return base::Bind(&ShowExtensionInstallDialogImpl);
 }