Making ShowExtensionInstallDialog a callback

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"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
-#include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 60 matching lines @@
   0,  // Bundle installs don't show OAuth permissions.
   IDS_EXTENSION_PROMPT_OAUTH_REENABLE_HEADER,
   IDS_EXTENSION_PROMPT_OAUTH_PERMISSIONS_HEADER,
 };
 
 namespace {
 
 // Size of extension icon in top left of dialog.
 const int kIconSize = 69;
 
+// A flag used for SetExtensionInstallDialogAutoConfirmForTests
+enum AutoConfirmForTest {
+  DO_NOT_SKIP = 0,
+  PROCEED,
+  ABORT
+};
+
 // 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();
   float max_scale_factor_scale = ui::GetScaleFactorScale(max_scale_factor);
 
   return static_cast<int>(size_in_dip * max_scale_factor_scale);
 }
 
 // Returns bitmap for the default icon with size equal to the default icon's
 // pixel size under maximal supported scale factor.
 SkBitmap GetDefaultIconBitmapForMaxScaleFactor(bool is_app) {
   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[supported_scale_factors.size() - 1];
 
   return Extension::GetDefaultIcon(is_app).
       GetRepresentation(max_scale_factor).sk_bitmap();
 }
 
+void AutoConfirmTask(ExtensionInstallPrompt::Delegate* delegate, bool proceed) {

[Aaron Boodman, 2012/10/11 20:28:50]

This is a bit weird. Can check proceed in DoAutoConfirm, and just post-task to
either delegate->InstallUIProceed or delegate->InstallUIAbort, right?

[sail, 2012/10/11 21:18:47]

Done.

+  if (proceed)
+    delegate->InstallUIProceed();
+  else
+    delegate->InstallUIAbort(true);
+}
+
+void DoAutoConfirm(AutoConfirmForTest setting,
+                   ExtensionInstallPrompt::Delegate* delegate) {
+  bool proceed = (setting == PROCEED);
+  // We use PostTask instead of calling the delegate directly here, because in
+  // the real implementations it's highly likely the message loop will be
+  // pumping a few times before the user clicks accept or cancel.
+  MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&AutoConfirmTask, delegate, proceed));
+}
+
+AutoConfirmForTest CheckAutoConfirmCommandLineSwitch() {
+  const CommandLine* cmdline = CommandLine::ForCurrentProcess();
+  if (!cmdline->HasSwitch(switches::kAppsGalleryInstallAutoConfirmForTests))
+    return DO_NOT_SKIP;
+  std::string value = cmdline->GetSwitchValueASCII(
+      switches::kAppsGalleryInstallAutoConfirmForTests);
+  if (value == "accept")
+    return PROCEED;
+  else if (value == "cancel")
+    return ABORT;
+  else
+    NOTREACHED();
+  return DO_NOT_SKIP;
+}
+
 }  // namespace
 
 ExtensionInstallPrompt::Prompt::Prompt(Profile* profile, PromptType type)
     : type_(type),
       extension_(NULL),
       bundle_(NULL),
       average_rating_(0.0),
       rating_count_(0),
       profile_(profile) {
 }
@@ skipping 208 matching lines @@
   extension_ = extension;
   permissions_ = extension->GetActivePermissions();
   delegate_ = delegate;
   prompt_ = prompt;
   prompt_type_ = prompt.type();
 
   SetIcon(icon);
   FetchOAuthIssueAdviceIfNeeded();
 }
 
-void ExtensionInstallPrompt::ConfirmWebstoreInstall(Delegate* delegate,
-                                                    const Extension* extension,
-                                                    const SkBitmap* icon) {
+void ExtensionInstallPrompt::ConfirmWebstoreInstall(
+    Delegate* delegate,
+    const Extension* extension,
+    const SkBitmap* icon,
+    const ShowDialogCallback& show_dialog_callback) {
   // SetIcon requires |extension_| to be set. ConfirmInstall will setup the
   // remaining fields.
   extension_ = extension;
   SetIcon(icon);
-  ConfirmInstall(delegate, extension);
+  ConfirmInstall(delegate, extension, show_dialog_callback);
 }
 
-void ExtensionInstallPrompt::ConfirmInstall(Delegate* delegate,
-                                            const Extension* extension) {
+void ExtensionInstallPrompt::ConfirmInstall(
+    Delegate* delegate,
+    const Extension* extension,
+    const ShowDialogCallback& show_dialog_callback) {
   DCHECK(ui_loop_ == MessageLoop::current());
   extension_ = extension;
   permissions_ = extension->GetActivePermissions();
   delegate_ = delegate;
   prompt_type_ = INSTALL_PROMPT;
+  show_dialog_callback_ = show_dialog_callback;
 
   // We special-case themes to not show any confirm UI. Instead they are
   // immediately installed, and then we show an infobar (see OnInstallSuccess)
   // to allow the user to revert if they don't like it.
   //
   // We don't do this in the case where off-store extension installs are
   // disabled because in that case, we don't show the dangerous download UI, so
   // we need the UI confirmation.
   if (extension->is_theme()) {
     if (extension->from_webstore() ||
@@ skipping 152 matching lines @@
     prompt_.SetPermissions(permissions_->GetWarningMessages(extension_type));
   }
 
   switch (prompt_type_) {
     case PERMISSIONS_PROMPT:
     case RE_ENABLE_PROMPT:
     case INLINE_INSTALL_PROMPT:
     case INSTALL_PROMPT: {
       prompt_.set_extension(extension_);
       prompt_.set_icon(gfx::Image(icon_));
-      ShowExtensionInstallDialog(parent_, navigator_, delegate_, prompt_);
       break;
     }
     case BUNDLE_INSTALL_PROMPT: {
       prompt_.set_bundle(bundle_);
-      ShowExtensionInstallDialog(parent_, navigator_, delegate_, prompt_);
       break;
     }
     default:
       NOTREACHED() << "Unknown message";
-      break;
+      return;
   }
+
+  AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch();

[Aaron Boodman, 2012/10/11 20:28:50]

is there any reason for CheckAutoConfirmCommandLineSwitch() to be a separate
function? It seems its result is only passed to DoAutoConfirm. Can it be rolled
into that function, and then here, do:

if (DoAutoConfirm(delegate_))
  return;

[sail, 2012/10/11 21:18:47]

Done.

+  if (auto_confirm != DO_NOT_SKIP) {
+    DoAutoConfirm(auto_confirm, delegate_);
+    return;
+  }
+
+  if (show_dialog_callback_.is_null())
+    ShowExtensionInstallDialogImpl(parent_, navigator_, delegate_, prompt_);
+  else
+    show_dialog_callback_.Run(parent_, navigator_, delegate_, prompt_);
 }
 
 namespace chrome {
 
 ExtensionInstallPrompt* CreateExtensionInstallPromptWithBrowser(
     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