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

chrome/browser/extensions/extension_install_prompt.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/extensions/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 73 matching lines @@
     ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL,
     ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL,
 };
 static const int kAcceptButtonIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     IDS_EXTENSION_PROMPT_INSTALL_BUTTON,
     IDS_EXTENSION_PROMPT_INSTALL_BUTTON,
     IDS_EXTENSION_PROMPT_INSTALL_BUTTON,
     IDS_EXTENSION_PROMPT_RE_ENABLE_BUTTON,
     IDS_EXTENSION_PROMPT_PERMISSIONS_BUTTON,
     0,  // External installs use different strings for extensions/apps.
-    IDS_EXTENSION_PROMPT_PERMISSIONS_CLEAR_RETAINED_FILES_BUTTON,
+    0,  // Different strings depending on the files and devices retained.
     IDS_EXTENSION_PROMPT_LAUNCH_BUTTON,
     IDS_EXTENSION_PROMPT_REMOTE_INSTALL_BUTTON,
 };
 static const int kAbortButtonIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     0,  // These all use the platform's default cancel label.
     0,
     0,
     0,
     IDS_EXTENSION_PROMPT_PERMISSIONS_ABORT_BUTTON,
     IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ABORT_BUTTON,
@@ skipping 95 matching lines @@
     case ExtensionInstallPrompt::UNSET_PROMPT_TYPE:
     case ExtensionInstallPrompt::NUM_PROMPT_TYPES:
       break;
   }
   return "OTHER";
 }
 
 ExtensionInstallPrompt::Prompt::Prompt(PromptType type)
     : type_(type),
       is_showing_details_for_retained_files_(false),
+      is_showing_details_for_retained_devices_(false),
       extension_(NULL),
       bundle_(NULL),
       average_rating_(0.0),
       rating_count_(0),
       show_user_count_(false),
       has_webstore_data_(false) {
 }
 
 ExtensionInstallPrompt::Prompt::~Prompt() {
 }
@@ skipping 15 matching lines @@
     DetailsType type,
     size_t index,
     bool is_showing_details) {
   switch (type) {
     case PERMISSIONS_DETAILS:
       is_showing_details_for_permissions_[index] = is_showing_details;
       break;
     case RETAINED_FILES_DETAILS:
       is_showing_details_for_retained_files_ = is_showing_details;
       break;
+    case RETAINED_DEVICES_DETAILS:
+      is_showing_details_for_retained_devices_ = is_showing_details;
+      break;
   }
 }
 
 void ExtensionInstallPrompt::Prompt::SetWebstoreData(
     const std::string& localized_user_count,
     bool show_user_count,
     double average_rating,
     int rating_count) {
   CHECK(type_ == INLINE_INSTALL_PROMPT || type_ == EXTERNAL_INSTALL_PROMPT);
   localized_user_count_ = localized_user_count;
@@ skipping 40 matching lines @@
     else
       resource_id = IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_HEADING_EXTENSION;
     return l10n_util::GetStringUTF16(resource_id);
   } else {
     return l10n_util::GetStringFUTF16(
         kHeadingIds[type_], base::UTF8ToUTF16(extension_->name()));
   }
 }
 
 int ExtensionInstallPrompt::Prompt::GetDialogButtons() const {
-  if (type_ == POST_INSTALL_PERMISSIONS_PROMPT &&
-      ShouldDisplayRevokeFilesButton()) {
+  if (type_ == POST_INSTALL_PERMISSIONS_PROMPT && ShouldDisplayRevokeButton()) {
     return kButtons[type_] | ui::DIALOG_BUTTON_OK;
   }
 
   return kButtons[type_];
 }
 
 bool ExtensionInstallPrompt::Prompt::ShouldShowExplanationText() const {
   return type_ == INSTALL_PROMPT && extension_->is_extension() &&
          experiment_.get() && experiment_->text_only();
 }
 
 bool ExtensionInstallPrompt::Prompt::HasAcceptButtonLabel() const {
+  if (type_ == POST_INSTALL_PERMISSIONS_PROMPT)
+    return ShouldDisplayRevokeButton();
+
   if (kAcceptButtonIds[type_] == 0)
     return false;
 
-  if (type_ == POST_INSTALL_PERMISSIONS_PROMPT)
-    return ShouldDisplayRevokeFilesButton();
-
   return true;
 }
 
 base::string16 ExtensionInstallPrompt::Prompt::GetAcceptButtonLabel() const {
   if (type_ == EXTERNAL_INSTALL_PROMPT) {
     int id = -1;
     if (extension_->is_app())
       id = IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ACCEPT_BUTTON_APP;
     else if (extension_->is_theme())
       id = IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ACCEPT_BUTTON_THEME;
     else
       id = IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ACCEPT_BUTTON_EXTENSION;
     return l10n_util::GetStringUTF16(id);
+  } else if (type_ == POST_INSTALL_PERMISSIONS_PROMPT) {
+    int id = -1;
+    if (GetRetainedFileCount() && GetRetainedDeviceCount()) {
+      id =
+          IDS_EXTENSION_PROMPT_PERMISSIONS_CLEAR_RETAINED_FILES_AND_DEVICES_BUTTON;

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

(hm I guess clang-format put a line-break there to try to save one space..
probably best to leave it)

+    } else if (GetRetainedFileCount()) {
+      id = IDS_EXTENSION_PROMPT_PERMISSIONS_CLEAR_RETAINED_FILES_BUTTON;
+    } else {
+      DCHECK_LT(0U, GetRetainedDeviceCount());
+      id = IDS_EXTENSION_PROMPT_PERMISSIONS_CLEAR_RETAINED_DEVICES_BUTTON;
+    }
+    return l10n_util::GetStringUTF16(id);
   }
   if (ShouldShowExplanationText())
     return experiment_->GetOkButtonText();
   return l10n_util::GetStringUTF16(kAcceptButtonIds[type_]);
 }
 
 bool ExtensionInstallPrompt::Prompt::HasAbortButtonLabel() const {
   if (ShouldShowExplanationText())
     return true;
   return kAbortButtonIds[type_] > 0;
@@ skipping 19 matching lines @@
       IDS_EXTENSION_PROMPT_RETAINED_FILES_FEW,
       IDS_EXTENSION_PROMPT_RETAINED_FILES_MANY,
   };
   std::vector<int> message_ids;
   for (size_t i = 0; i < arraysize(kRetainedFilesMessageIDs); i++) {
     message_ids.push_back(kRetainedFilesMessageIDs[i]);
   }
   return l10n_util::GetPluralStringFUTF16(message_ids, GetRetainedFileCount());
 }
 
+base::string16 ExtensionInstallPrompt::Prompt::GetRetainedDevicesHeading()
+    const {
+  const int kRetainedDevicesMessageIDs[6] = {
+      IDS_EXTENSION_PROMPT_RETAINED_DEVICES_DEFAULT,
+      IDS_EXTENSION_PROMPT_RETAINED_DEVICE_SINGULAR,
+      IDS_EXTENSION_PROMPT_RETAINED_DEVICES_ZERO,
+      IDS_EXTENSION_PROMPT_RETAINED_DEVICES_TWO,
+      IDS_EXTENSION_PROMPT_RETAINED_DEVICES_FEW,
+      IDS_EXTENSION_PROMPT_RETAINED_DEVICES_MANY,
+  };
+  std::vector<int> message_ids;

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

(optional) I would have used the iterator begin/end vector constructor here, but
I think I'm weird. What you have is fine, and consistent with the above.

i.e.
  const std::vector<int> message_ids(
      kRetainedDevicesMessageIDs,
      kRetainedDevicesMessageIDs + arraysize(kRetainedDevicesMessageIDs));

or (C++11)
  const std::vector<int> message_ids(
      begin(kRetainedDevicesMessageIDs),
      end(kRetainedDevicesMessageIDs));

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

Done.

+  for (size_t i = 0; i < arraysize(kRetainedDevicesMessageIDs); i++) {
+    message_ids.push_back(kRetainedDevicesMessageIDs[i]);
+  }
+  return l10n_util::GetPluralStringFUTF16(message_ids,
+                                          GetRetainedDeviceCount());
+}
+
 bool ExtensionInstallPrompt::Prompt::ShouldShowPermissions() const {
   return GetPermissionCount() > 0 || type_ == POST_INSTALL_PERMISSIONS_PROMPT;
 }
 
 void ExtensionInstallPrompt::Prompt::AppendRatingStars(
     StarAppender appender, void* data) const {
   CHECK(appender);
   CHECK(type_ == INLINE_INSTALL_PROMPT || type_ == EXTERNAL_INSTALL_PROMPT);
   int rating_integer = floor(average_rating_);
   double rating_fractional = average_rating_ - rating_integer;
@@ skipping 57 matching lines @@
 }
 
 bool ExtensionInstallPrompt::Prompt::GetIsShowingDetails(
     DetailsType type, size_t index) const {
   switch (type) {
     case PERMISSIONS_DETAILS:
       CHECK_LT(index, is_showing_details_for_permissions_.size());
       return is_showing_details_for_permissions_[index];
     case RETAINED_FILES_DETAILS:
       return is_showing_details_for_retained_files_;
+    case RETAINED_DEVICES_DETAILS:
+      return is_showing_details_for_retained_devices_;
   }
   return false;
 }
 
 size_t ExtensionInstallPrompt::Prompt::GetRetainedFileCount() const {
   return retained_files_.size();
 }
 
 base::string16 ExtensionInstallPrompt::Prompt::GetRetainedFile(size_t index)
     const {
   CHECK_LT(index, retained_files_.size());
   return retained_files_[index].AsUTF16Unsafe();
 }
 
-bool ExtensionInstallPrompt::Prompt::ShouldDisplayRevokeFilesButton() const {
-  return !retained_files_.empty();
+size_t ExtensionInstallPrompt::Prompt::GetRetainedDeviceCount() const {
+  return retained_device_messages_.size();
+}
+
+bool ExtensionInstallPrompt::Prompt::ShouldDisplayRevokeButton() const {
+  return !retained_files_.empty() || !retained_device_messages_.empty();
+}
+
+const base::string16&

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

nit: maybe return a value? just for consistency with the rest of the API (i.e.
that it works in this case feels like an implementation detail that shouldn't
leak out to the public class API). I don't really feel strongly about this
though

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

Done.

+ExtensionInstallPrompt::Prompt::GetRetainedDeviceMessageString(
+    size_t index) const {
+  CHECK_LT(index, retained_device_messages_.size());
+  return retained_device_messages_[index];
 }
 
 ExtensionInstallPrompt::ShowParams::ShowParams(content::WebContents* contents)
     : parent_web_contents(contents),
       parent_window(NativeWindowForWebContents(contents)),
       navigator(contents) {
 }
 
 ExtensionInstallPrompt::ShowParams::ShowParams(
     gfx::NativeWindow window,
@@ skipping 175 matching lines @@
   permissions_ = permissions;
   delegate_ = delegate;
   prompt_ = new Prompt(PERMISSIONS_PROMPT);
 
   LoadImageIfNeeded();
 }
 
 void ExtensionInstallPrompt::ReviewPermissions(
     Delegate* delegate,
     const Extension* extension,
-    const std::vector<base::FilePath>& retained_file_paths) {
+    const std::vector<base::FilePath>& retained_file_paths,
+    const std::vector<base::string16>& retained_device_messages) {
   DCHECK(ui_loop_ == base::MessageLoop::current());
   extension_ = extension;
   permissions_ = extension->permissions_data()->active_permissions();
   prompt_ = new Prompt(POST_INSTALL_PERMISSIONS_PROMPT);
   prompt_->set_retained_files(retained_file_paths);
+  prompt_->set_retained_device_messages(retained_device_messages);
   delegate_ = delegate;
 
   LoadImageIfNeeded();
 }
 
 void ExtensionInstallPrompt::OnInstallSuccess(const Extension* extension,
                                               SkBitmap* icon) {
   extension_ = extension;
   SetIcon(icon);
 
@@ skipping 95 matching lines @@
   }
 
   if (AutoConfirmPrompt(delegate_))
     return;
 
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
   else
     show_dialog_callback_.Run(show_params_, delegate_, prompt_);
 }