Add a new webstorePrivate API to show a permission prompt for delegated installs

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 f956a5796a090fbba903e6a61e7029d8b28ad523..289b90a240f6799974e9bd98b37941f2217bdfb2 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -70,6 +70,7 @@ static const int kTitleIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     IDS_EXTENSION_LAUNCH_APP_PROMPT_TITLE,
     0,  // The remote install prompt depends on what's being installed.
     0,  // The repair install prompt depends on what's being installed.
+    IDS_EXTENSION_DELEGATED_INSTALL_PROMPT_TITLE,

[not at google - send to devlin, 2015/02/04 21:28:29]

This relates to the resource - the way this code is written, and the resource is
written, the only wording you'll ever see is "this extension". You might want to
install Apps though, right? Or Themes?

The way this resource mapping is written is pretty confusing, sorry bout that :(
these should all just have a substitution of the type rather than needing to
define 2-3 versions of the same string. Ah well.

[Marc Treib, 2015/02/05 10:33:37]

Done.

 };
 static const int kHeadingIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     IDS_EXTENSION_INSTALL_PROMPT_HEADING,
@@ -81,7 +82,8 @@ static const int kHeadingIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     IDS_EXTENSION_POST_INSTALL_PERMISSIONS_PROMPT_HEADING,
     IDS_EXTENSION_LAUNCH_APP_PROMPT_HEADING,
     IDS_EXTENSION_REMOTE_INSTALL_PROMPT_HEADING,
-    IDS_EXTENSION_REPAIR_PROMPT_HEADING
+    IDS_EXTENSION_REPAIR_PROMPT_HEADING,
+    IDS_EXTENSION_INSTALL_PROMPT_HEADING,
 };
 static const int kButtons[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL,
@@ -94,6 +96,7 @@ static const int kButtons[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL,
     ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL,
     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,
@@ -106,6 +109,7 @@ static const int kAcceptButtonIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     IDS_EXTENSION_PROMPT_LAUNCH_BUTTON,
     IDS_EXTENSION_PROMPT_REMOTE_INSTALL_BUTTON,
     IDS_EXTENSION_PROMPT_REPAIR_BUTTON,
+    IDS_EXTENSION_PROMPT_PERMISSIONS_BUTTON,
 };
 static const int kAbortButtonIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     0,  // These all use the platform's default cancel label.
@@ -118,6 +122,7 @@ static const int kAbortButtonIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
     0,  // Platform dependent cancel button.
     0,
     0,
+    IDS_EXTENSION_PROMPT_PERMISSIONS_ABORT_BUTTON,
 };
 static const int
     kPermissionsHeaderIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
@@ -131,6 +136,7 @@ static const int
         IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
         IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
         IDS_EXTENSION_PROMPT_CAN_ACCESS,
+        IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
 };
 
 // Returns bitmap for the default icon with size equal to the default icon's
@@ -217,6 +223,8 @@ std::string ExtensionInstallPrompt::PromptTypeToString(PromptType type) {
       return "REMOTE_INSTALL_PROMPT";
     case ExtensionInstallPrompt::REPAIR_PROMPT:
       return "REPAIR_PROMPT";
+    case ExtensionInstallPrompt::DELEGATED_PERMISSIONS_PROMPT:
+      return "DELEGATED_PERMISSIONS_PROMPT";
     case ExtensionInstallPrompt::UNSET_PROMPT_TYPE:
     case ExtensionInstallPrompt::NUM_PROMPT_TYPES:
       break;
@@ -331,6 +339,10 @@ base::string16 ExtensionInstallPrompt::Prompt::GetDialogTitle() const {
       resource_id = IDS_EXTENSION_REPAIR_APP_PROMPT_TITLE;
     else
       resource_id = IDS_EXTENSION_REPAIR_EXTENSION_PROMPT_TITLE;
+  } else if (type_ == DELEGATED_PERMISSIONS_PROMPT) {
+    DCHECK(!username_.empty());
+    return l10n_util::GetStringFUTF16(
+        resource_id, base::UTF8ToUTF16(username_));

[not at google - send to devlin, 2015/02/04 21:28:29]

Why is there both username_ and delegated_username_?

[Marc Treib, 2015/02/05 10:33:37]

delegated_username_ lives in ExtensionInstallPrompt; username_ lives in
ExtensionInstallPrompt::Prompt.
There's no reason for them to have different names though; now they're both
called delegated_username_.

   }
 
   return l10n_util::GetStringUTF16(resource_id);
@@ -752,6 +764,20 @@ void ExtensionInstallPrompt::ConfirmInstall(
   LoadImageIfNeeded();
 }
 
+void ExtensionInstallPrompt::ConfirmPermissionsForDelegatedInstall(
+    Delegate* delegate,
+    const Extension* extension,
+    const std::string& delegated_username,
+    const SkBitmap* icon) {
+  DCHECK(ui_loop_ == base::MessageLoop::current());
+  delegate_ = delegate;
+  extension_ = extension;
+  delegated_username_ = delegated_username;
+  SetIcon(icon);
+  prompt_ = new Prompt(DELEGATED_PERMISSIONS_PROMPT);
+  ShowConfirmation();
+}
+
 void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate,
                                              const Extension* extension) {
   DCHECK(ui_loop_ == base::MessageLoop::current());
@@ -932,9 +958,11 @@ void ExtensionInstallPrompt::ShowConfirmation() {
     case LAUNCH_PROMPT:
     case POST_INSTALL_PERMISSIONS_PROMPT:
     case REMOTE_INSTALL_PROMPT:
-    case REPAIR_PROMPT: {
+    case REPAIR_PROMPT:
+    case DELEGATED_PERMISSIONS_PROMPT: {
       prompt_->set_extension(extension_);
       prompt_->set_icon(gfx::Image::CreateFrom1xBitmap(icon_));
+      prompt_->set_username(delegated_username_);
       break;
     }
     case BUNDLE_INSTALL_PROMPT: {