Refactoring ExtenionInstallUI to abstract the Browser references.

chrome/browser/extensions/crx_installer.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_CRX_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 #pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/version.h"
-#include "chrome/browser/extensions/extension_install_ui.h"
+#include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/sandboxed_extension_unpacker.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/string_ordinal.h"
 #include "chrome/common/web_apps.h"
 
 class ExtensionService;
 class SkBitmap;
 
 namespace extensions {
@@ skipping 18 matching lines @@
 //
 // IMPORTANT: Callers should keep a reference to a CrxInstaller while they are
 // working with it, eg:
 //
 // scoped_refptr<CrxInstaller> installer(new CrxInstaller(...));
 // installer->set_foo();
 // installer->set_bar();
 // installer->InstallCrx(...);
 class CrxInstaller
     : public SandboxedExtensionUnpackerClient,
-      public ExtensionInstallUI::Delegate {
+      public ExtensionInstallPrompt::Delegate {
  public:
   // Extensions will be installed into frontend->install_directory(),
   // then registered with |frontend|. Any install UI will be displayed
   // using |client|. Pass NULL for |client| for silent install
   static scoped_refptr<CrxInstaller> Create(
       ExtensionService* frontend,
-      ExtensionInstallUI* client);
+      ExtensionInstallPrompt* client);
 
   // Same as the previous method, except use the |approval| to bypass the
   // prompt. Note that the caller retains ownership of |approval|.
   static scoped_refptr<CrxInstaller> Create(
       ExtensionService* frontend,
-      ExtensionInstallUI* client,
+      ExtensionInstallPrompt* client,
       const WebstoreInstaller::Approval* approval);
 
   // Install the crx in |source_file|.
   void InstallCrx(const FilePath& source_file);
 
   // Convert the specified user script into an extension and install it.
   void InstallUserScript(const FilePath& source_file,
                          const GURL& download_url);
 
   // Convert the specified web app into an extension and install it.
   void InstallWebApp(const WebApplicationInfo& web_app);
 
-  // Overridden from ExtensionInstallUI::Delegate:
+  // Overridden from ExtensionInstallPrompt::Delegate:
   virtual void InstallUIProceed() OVERRIDE;
   virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
   int creation_flags() const { return creation_flags_; }
   void set_creation_flags(int val) { creation_flags_ = val; }
 
   const GURL& download_url() const { return download_url_; }
   void set_download_url(const GURL& val) { download_url_ = val; }
 
   const FilePath& source_file() const { return source_file_; }
@@ skipping 58 matching lines @@
   void set_page_ordinal(const StringOrdinal& page_ordinal) {
     page_ordinal_ = page_ordinal;
   }
 
   Profile* profile() { return profile_; }
 
  private:
   friend class extensions::ExtensionUpdaterTest;
 
   CrxInstaller(base::WeakPtr<ExtensionService> frontend_weak,
-               ExtensionInstallUI* client,
+               ExtensionInstallPrompt* client,
                const WebstoreInstaller::Approval* approval);
   virtual ~CrxInstaller();
 
   // Converts the source user script to an extension.
   void ConvertUserScriptOnFileThread();
 
   // Converts the source web app to an extension.
   void ConvertWebAppOnFileThread(const WebApplicationInfo& web_app);
 
   // Called after OnUnpackSuccess as a last check to see whether the install
   // should complete.
   bool AllowInstall(const extensions::Extension* extension, string16* error);
 
   // SandboxedExtensionUnpackerClient
   virtual void OnUnpackFailure(const string16& error_message) OVERRIDE;
   virtual void OnUnpackSuccess(const FilePath& temp_dir,
                                const FilePath& extension_dir,
                                const base::DictionaryValue* original_manifest,
                                const extensions::Extension* extension) OVERRIDE;
 
   // Returns true if we can skip confirmation because the install was
   // whitelisted.
   bool CanSkipConfirmation();
 
-  // Runs on the UI thread. Confirms with the user (via ExtensionInstallUI) that
-  // it is OK to install this extension.
+  // Runs on the UI thread. Confirms with the user (via ExtensionInstallPrompt)
+  // that it is OK to install this extension.
   void ConfirmInstall();
 
   // Runs on File thread. Install the unpacked extension into the profile and
   // notify the frontend.
   void CompleteInstall();
 
   // Result reporting.
   void ReportFailureFromFileThread(const string16& error);
   void ReportFailureFromUIThread(const string16& error);
   void ReportSuccessFromFileThread();
@@ skipping 76 matching lines @@
   // The frontend we will report results back to.
   base::WeakPtr<ExtensionService> frontend_weak_;
 
   // The Profile where the extension is being installed in.
   Profile* profile_;
 
   // The client we will work with to do the installation. This can be NULL, in
   // which case the install is silent.
   // NOTE: we may be deleted on the file thread. To ensure the UI is deleted on
   // the main thread we don't use a scoped_ptr here.
-  ExtensionInstallUI* client_;
+  ExtensionInstallPrompt* client_;
 
   // The root of the unpacked extension directory. This is a subdirectory of
   // temp_dir_, so we don't have to delete it explicitly.
   FilePath unpacked_extension_root_;
 
   // True when the CRX being installed was just downloaded.
   // Used to trigger extra checks before installing.
   bool apps_require_extension_mime_type_;
 
   // Allows for the possibility of a normal install (one in which a |client|
@@ skipping 12 matching lines @@
   extension_misc::CrxInstallCause install_cause_;
 
   // Creation flags to use for the extension.  These flags will be used
   // when calling Extenion::Create() by the crx installer.
   int creation_flags_;
 
   DISALLOW_COPY_AND_ASSIGN(CrxInstaller);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_