Making ShowExtensionInstallDialog a callback

chrome/browser/extensions/extension_install_prompt.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
 
 #include <string>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/extensions/crx_installer_error.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "google_apis/gaia/oauth2_mint_token_flow.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 129 matching lines @@
     virtual void InstallUIProceed() = 0;
 
     // We call this method to signal that the installation should stop, with
     // |user_initiated| true if the installation was stopped by the user.
     virtual void InstallUIAbort(bool user_initiated) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
+  typedef base::Callback<void(gfx::NativeWindow,
+                              content::PageNavigator*,
+                              ExtensionInstallPrompt::Delegate*,
+                              const ExtensionInstallPrompt::Prompt&)>
+      ShowDialogCallback;

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

Add documentation

+
   // Creates a dummy extension from the |manifest|, replacing the name and
   // description with the localizations if provided.
   static scoped_refptr<extensions::Extension> GetLocalizedExtensionForDisplay(
       const base::DictionaryValue* manifest,
       int flags,  // Extension::InitFromValueFlags
       const std::string& id,
       const std::string& localized_name,
       const std::string& localized_description,
       std::string* error);
 
@@ skipping 19 matching lines @@
   // This is called by the standalone installer to verify whether the install
   // from the webstore should proceed.
   //
   // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
   virtual void ConfirmStandaloneInstall(Delegate* delegate,
                                         const extensions::Extension* extension,
                                         SkBitmap* icon,
                                         const Prompt& prompt);
 
   // This is called by the installer to verify whether the installation from
-  // the webstore should proceed.
+  // the webstore should proceed. |show_dialog_callback| is optional and can be
+  // NULL.
   //
   // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
-  virtual void ConfirmWebstoreInstall(Delegate* delegate,
-                                      const extensions::Extension* extension,
-                                      const SkBitmap* icon);
+  virtual void ConfirmWebstoreInstall(
+      Delegate* delegate,
+      const extensions::Extension* extension,
+      const SkBitmap* icon,
+      const ShowDialogCallback& show_dialog_callback);
 
   // This is called by the installer to verify whether the installation should
-  // proceed. This is declared virtual for testing.
+  // proceed. This is declared virtual for testing. |show_dialog_callback| is
+  // optional and can be NULL.
   //
   // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
   virtual void ConfirmInstall(Delegate* delegate,
-                              const extensions::Extension* extension);
+                              const extensions::Extension* extension,
+                              const ShowDialogCallback& show_dialog_callback);
 
   // This is called by the app handler launcher to verify whether the app
   // should be re-enabled. This is declared virtual for testing.
   //
   // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
   virtual void ConfirmReEnable(Delegate* delegate,
                                const extensions::Extension* extension);
 
   // This is called by the extension permissions API to verify whether an
   // extension may be granted additional permissions.
@@ skipping 82 matching lines @@
   Prompt prompt_;
 
   // The type of prompt we are going to show.
   PromptType prompt_type_;
 
   scoped_ptr<OAuth2MintTokenFlow> token_flow_;
 
   // Keeps track of extension images being loaded on the File thread for the
   // purpose of showing the install UI.
   ImageLoadingTracker tracker_;
+
+  // Used to show the confirm dialog.
+  ShowDialogCallback show_dialog_callback_;
 };
 
+// Shows the default extension install dialog.
+// The implementations of this function are platform-specific.
+void ShowExtensionInstallDialogImpl(
+    gfx::NativeWindow parent,
+    content::PageNavigator* navigator,
+    ExtensionInstallPrompt::Delegate* delegate,
+    const ExtensionInstallPrompt::Prompt& prompt);
+
 namespace chrome {
 
 // Creates an ExtensionInstallPrompt from |browser|. Caller assumes ownership.
 // TODO(beng): remove this once various extensions types are weaned from
 //             Browser.
 ExtensionInstallPrompt* CreateExtensionInstallPromptWithBrowser(
     Browser* browser);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_