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 85 matching lines @@
   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();
 }
 
+// If auto confirm is enabled then posts a task to proceed with or cancel the install
+// and returns true. Otherwise returns false.
+bool DoAutoConfirm(ExtensionInstallPrompt::Delegate* delegate) {
+  const CommandLine* cmdline = CommandLine::ForCurrentProcess();
+  if (!cmdline->HasSwitch(switches::kAppsGalleryInstallAutoConfirmForTests))
+    return false;
+  std::string value = cmdline->GetSwitchValueASCII(
+      switches::kAppsGalleryInstallAutoConfirmForTests);
+
+  // 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.
+  if (value == "accept") {
+    MessageLoop::current()->PostTask(
+          FROM_HERE, base::Bind(&ExtensionInstallPrompt::Delegate::InstallUIProceed,

[Aaron Boodman, 2012/10/11 21:44:47]

Weird indent.

[Aaron Boodman, 2012/10/11 21:44:47]

80 cols

[sail, 2012/10/11 21:49:38]

Done.

[sail, 2012/10/11 21:49:38]

Done.

+                                base::Unretained(delegate)));
+    return true;
+  }
+
+  if (value == "cancel") {
+    MessageLoop::current()->PostTask(

[Aaron Boodman, 2012/10/11 21:44:47]

ditto

[sail, 2012/10/11 21:49:38]

Done.

+          FROM_HERE, base::Bind(&ExtensionInstallPrompt::Delegate::InstallUIAbort,
+                                base::Unretained(delegate),
+                                true));
+    return true;
+  }
+
+  NOTREACHED();
+  return false;
+}
+
 }  // 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;
+  DCHECK(!show_dialog_callback_.is_null());
 
   // 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;
   }
+

[Aaron Boodman, 2012/10/11 21:44:47]

naming: if (AutoConfirmPrompt()) ?

[sail, 2012/10/11 21:49:55]

Done.

+  if (DoAutoConfirm(delegate_))
+    return;
+
+  DCHECK(!show_dialog_callback_.is_null());
+  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