Making the extension permissions dialog scrollable, when needed (adding expandable sections for thi…

chrome/browser/extensions/extension_install_prompt.cc

Index: chrome/browser/extensions/extension_install_prompt.cc
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 9faaa3a38106b86605ebe2c58a15ba053f0adc91..a2185118fffc78c0ba32f206ae6c91d838a1a063 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -198,8 +198,11 @@ ExtensionInstallPrompt::Prompt::~Prompt() {
 }
 
 void ExtensionInstallPrompt::Prompt::SetPermissions(
-    const std::vector<string16>& permissions) {
-  permissions_ = permissions;
+    const std::vector<string16>& permissions, bool verbose) {
+  if (verbose)
+    permissions_verbose_ = permissions;
+  else
+    permissions_ = permissions;
 }
 
 void ExtensionInstallPrompt::Prompt::SetOAuthIssueAdvice(
@@ -316,11 +319,21 @@ string16 ExtensionInstallPrompt::Prompt::GetOAuthHeading() const {
 }
 
 string16 ExtensionInstallPrompt::Prompt::GetRetainedFilesHeading() const {
+  // TODO(finnur): Remove this once all platforms are using
+  // GetRetainedFilesHeadingWithCount().
   return l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_RETAINED_FILES);
 }
 
+string16
+ExtensionInstallPrompt::Prompt::GetRetainedFilesHeadingWithCount() const {
+  return l10n_util::GetStringFUTF16(
+      IDS_EXTENSION_PROMPT_RETAINED_FILES_WITH_COUNT,
+      base::IntToString16(GetRetainedFileCount()));
+}
+
 bool ExtensionInstallPrompt::Prompt::ShouldShowPermissions() const {
-  return GetPermissionCount() > 0 || type_ == POST_INSTALL_PERMISSIONS_PROMPT;
+  return GetPermissionCount(false) > 0 ||
+         type_ == POST_INSTALL_PERMISSIONS_PROMPT;
 }
 
 void ExtensionInstallPrompt::Prompt::AppendRatingStars(
@@ -366,13 +379,22 @@ string16 ExtensionInstallPrompt::Prompt::GetUserCount() const {
       UTF8ToUTF16(localized_user_count_));
 }
 
-size_t ExtensionInstallPrompt::Prompt::GetPermissionCount() const {
-  return permissions_.size();
+size_t ExtensionInstallPrompt::Prompt::GetPermissionCount(bool verbose) const {
+  if (verbose)
+    return permissions_verbose_.size();
+  else
+    return permissions_.size();
 }
 
-string16 ExtensionInstallPrompt::Prompt::GetPermission(size_t index) const {
-  CHECK_LT(index, permissions_.size());
-  return permissions_[index];
+string16 ExtensionInstallPrompt::Prompt::GetPermission(
+    size_t index, bool verbose) const {
+  if (verbose) {
+    CHECK_LT(index, permissions_verbose_.size());
+    return permissions_verbose_[index];
+  } else {
+    CHECK_LT(index, permissions_.size());
+    return permissions_[index];
+  }
 }
 
 size_t ExtensionInstallPrompt::Prompt::GetOAuthIssueCount() const {
@@ -719,7 +741,10 @@ void ExtensionInstallPrompt::ShowConfirmation() {
            extension_))) {
     Manifest::Type extension_type = extension_ ?
         extension_->GetType() : Manifest::TYPE_UNKNOWN;
-    prompt_.SetPermissions(permissions_->GetWarningMessages(extension_type));
+    prompt_.SetPermissions(
+      permissions_->GetWarningMessages(extension_type, true), true);
+    prompt_.SetPermissions(
+      permissions_->GetWarningMessages(extension_type, false), false);
   }
 
   switch (prompt_.type()) {