New post-sideload UI:

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/file_util.h"
@@ skipping 26 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 using extensions::BundleInstaller;
 using extensions::Extension;
 using extensions::PermissionSet;
 
+namespace {
+
 static const int kTitleIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
   0,  // The regular install prompt depends on what's being installed.
   IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_RE_ENABLE_PROMPT_TITLE,
-  IDS_EXTENSION_PERMISSIONS_PROMPT_TITLE
+  IDS_EXTENSION_PERMISSIONS_PROMPT_TITLE,
+  IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_TITLE,
 };
 static const int kHeadingIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
   IDS_EXTENSION_INSTALL_PROMPT_HEADING,
   0,  // Inline installs use the extension name.
   0,  // Heading for bundle installs depends on the bundle contents.
   IDS_EXTENSION_RE_ENABLE_PROMPT_HEADING,
-  IDS_EXTENSION_PERMISSIONS_PROMPT_HEADING
+  IDS_EXTENSION_PERMISSIONS_PROMPT_HEADING,
+  IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_HEADING,
 };
 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
+  IDS_EXTENSION_PROMPT_PERMISSIONS_BUTTON,
+  IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ACCEPT_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_PROMPT_PERMISSIONS_ABORT_BUTTON,
+  IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ABORT_BUTTON,
 };
 static const int kPermissionsHeaderIds[
     ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
   IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_THESE_WILL_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_WANTS_ACCESS_TO,
+  IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
 };
-static const int kOAuthHeaderIds[
-    ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
+static const int kOAuthHeaderIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
   IDS_EXTENSION_PROMPT_OAUTH_HEADER,
   0,  // Inline installs don't show OAuth permissions.
   0,  // Bundle installs don't show OAuth permissions.
   IDS_EXTENSION_PROMPT_OAUTH_REENABLE_HEADER,
   IDS_EXTENSION_PROMPT_OAUTH_PERMISSIONS_HEADER,
+  0,  // TODO(mpcomplete): Do we need this for external install UI?

[Jeffrey Yasskin, 2012/10/13 21:17:35]

I'd assume external extensions can ask for oauth permissions just like
user-installed ones, and that we should warn just the same, but I can't find the
docs on user-installed oauth permission requests, so I can't tell for sure.

 };
 
-namespace {
-
 // Size of extension icon in top left of dialog.
 const int kIconSize = 69;
 
 // Returns pixel size under maximal scale factor for the icon whose device
 // independent size is |size_in_dip|
 int GetSizeForMaxScaleFactor(int size_in_dip) {
   std::vector<ui::ScaleFactor> supported_scale_factors =
       ui::GetSupportedScaleFactors();
   // Scale factors are in ascending order, so the last one is the one we need.
   ui::ScaleFactor max_scale_factor = supported_scale_factors.back();
@@ skipping 85 matching lines @@
 string16 ExtensionInstallPrompt::Prompt::GetDialogTitle() const {
   int resource_id = kTitleIds[type_];
 
   if (type_ == INSTALL_PROMPT) {
     if (extension_->is_app())
       resource_id = IDS_EXTENSION_INSTALL_APP_PROMPT_TITLE;
     else if (extension_->is_theme())
       resource_id = IDS_EXTENSION_INSTALL_THEME_PROMPT_TITLE;
     else
       resource_id = IDS_EXTENSION_INSTALL_EXTENSION_PROMPT_TITLE;
+  } else if (type_ == EXTERNAL_INSTALL_PROMPT) {
+    return l10n_util::GetStringFUTF16(
+        resource_id, UTF8ToUTF16(extension_->name()));
   }
 
   return l10n_util::GetStringUTF16(resource_id);
 }
 
 string16 ExtensionInstallPrompt::Prompt::GetHeading() const {
   if (type_ == INLINE_INSTALL_PROMPT) {
     return UTF8ToUTF16(extension_->name());
   } else if (type_ == BUNDLE_INSTALL_PROMPT) {
     return bundle_->GetHeadingTextFor(BundleInstaller::Item::STATE_PENDING);
+  } else if (type_ == EXTERNAL_INSTALL_PROMPT) {
+    return l10n_util::GetStringUTF16(kHeadingIds[type_]);
   } else {
     return l10n_util::GetStringFUTF16(
         kHeadingIds[type_], UTF8ToUTF16(extension_->name()));
   }
 }
 
 string16 ExtensionInstallPrompt::Prompt::GetAcceptButtonLabel() const {
   return l10n_util::GetStringUTF16(kAcceptButtonIds[type_]);
 }
 
@@ skipping 207 matching lines @@
                                              const Extension* extension) {
   DCHECK(ui_loop_ == MessageLoop::current());
   extension_ = extension;
   permissions_ = extension->GetActivePermissions();
   delegate_ = delegate;
   prompt_type_ = RE_ENABLE_PROMPT;
 
   LoadImageIfNeeded();
 }
 
+void ExtensionInstallPrompt::ConfirmExternalInstall(
+    Delegate* delegate, const Extension* extension) {
+  DCHECK(ui_loop_ == MessageLoop::current());
+  extension_ = extension;
+  permissions_ = extension->GetActivePermissions();
+  delegate_ = delegate;
+  prompt_type_ = EXTERNAL_INSTALL_PROMPT;
+  show_dialog_callback_ =  // @@@MP

[Matt Perry, 2012/10/13 00:33:18]

I'll remove this once http://codereview.chromium.org/11131002/ lands.

+      ExtensionInstallPrompt::GetDefaultShowDialogCallback();
+
+  LoadImageIfNeeded();

[Jeffrey Yasskin, 2012/10/13 21:17:35]

Wow, that's a subtle name for the "go show the dialog" function.

+}
+
 void ExtensionInstallPrompt::ConfirmPermissions(
     Delegate* delegate,
     const Extension* extension,
     const PermissionSet* permissions) {
   DCHECK(ui_loop_ == MessageLoop::current());
   extension_ = extension;
   permissions_ = permissions;
   delegate_ = delegate;
   prompt_type_ = PERMISSIONS_PROMPT;
 
@@ skipping 43 matching lines @@
 
 void ExtensionInstallPrompt::OnImageLoaded(const gfx::Image& image,
                                            const std::string& extension_id,
                                            int index) {
   SetIcon(image.IsEmpty() ? NULL : image.ToSkBitmap());
   FetchOAuthIssueAdviceIfNeeded();
 }
 
 void ExtensionInstallPrompt::LoadImageIfNeeded() {
   // Bundle install prompts do not have an icon.
   if (!icon_.empty()) {

[Jeffrey Yasskin, 2012/10/13 21:17:35]

Not related to this CL, but !icon_.empty() seems to be the opposite condition
from the one mentioned by the comment on the previous line.

     FetchOAuthIssueAdviceIfNeeded();
     return;
   }
 
   // Load the image asynchronously. For the response, check OnImageLoaded.
   ExtensionResource image =
       extension_->GetIconResource(extension_misc::EXTENSION_ICON_LARGE,
                                   ExtensionIconSet::MATCH_BIGGER);
   // Load the icon whose pixel size is large enough to be displayed under
   // maximal supported scale factor. UI code will scale the icon down if needed.
   // TODO(tbarzic): We should use IconImage here and load the required bitmap
   //     lazily.
   int pixel_size = GetSizeForMaxScaleFactor(kIconSize);
   tracker_.LoadImage(extension_, image,
                      gfx::Size(pixel_size, pixel_size),
                      ImageLoadingTracker::DONT_CACHE);
 }
 
 void ExtensionInstallPrompt::FetchOAuthIssueAdviceIfNeeded() {
   // |extension_| may be NULL, e.g. in the bundle install case.
   if (!extension_ ||
       prompt_type_ == BUNDLE_INSTALL_PROMPT ||
       prompt_type_ == INLINE_INSTALL_PROMPT ||

[Jeffrey Yasskin, 2012/10/13 21:17:35]

Do you need to include EXTERNAL_INSTALL_PROMPT in this list if you decide not to
show oauth permissions?

[Matt Perry, 2012/10/15 19:13:38]

Good catch. Done.

       prompt_.GetOAuthIssueCount() != 0U) {
     ShowConfirmation();
     return;
   }
 
   const Extension::OAuth2Info& oauth2_info = extension_->oauth2_info();
   if (oauth2_info.client_id.empty() ||
       oauth2_info.scopes.empty()) {
     ShowConfirmation();
     return;
@@ skipping 32 matching lines @@
   if (permissions_) {
     Extension::Type extension_type = prompt_type_ == BUNDLE_INSTALL_PROMPT ?
         Extension::TYPE_UNKNOWN : extension_->GetType();
     prompt_.SetPermissions(permissions_->GetWarningMessages(extension_type));
   }
 
   switch (prompt_type_) {
     case PERMISSIONS_PROMPT:
     case RE_ENABLE_PROMPT:
     case INLINE_INSTALL_PROMPT:
+    case EXTERNAL_INSTALL_PROMPT:
     case INSTALL_PROMPT: {
       prompt_.set_extension(extension_);
       prompt_.set_icon(gfx::Image(icon_));
       break;
     }
     case BUNDLE_INSTALL_PROMPT: {
       prompt_.set_bundle(bundle_);
       break;
     }
     default:
@@ skipping 14 matching lines @@
     Browser* browser) {
   // |browser| can be NULL in unit tests.
   if (!browser)
     return new ExtensionInstallPrompt(NULL, NULL, NULL);
   gfx::NativeWindow parent =
       browser->window() ? browser->window()->GetNativeWindow() : NULL;
   return new ExtensionInstallPrompt(parent, browser, browser->profile());
 }
 
 }  // namespace chrome