| Index: chrome/browser/extensions/extension_install_ui.h
|
| diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h
|
| index 0b4b9681c3d36b7ebe223654d5a4a7e3d2c159d7..ed7dea4478ad1343c817d5eb9790d0a385457e5a 100644
|
| --- a/chrome/browser/extensions/extension_install_ui.h
|
| +++ b/chrome/browser/extensions/extension_install_ui.h
|
| @@ -27,7 +27,6 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
|
| enum PromptType {
|
| UNSET_PROMPT_TYPE = -1,
|
| INSTALL_PROMPT = 0,
|
| - UNINSTALL_PROMPT,
|
| RE_ENABLE_PROMPT,
|
| NUM_PROMPT_TYPES
|
| };
|
| @@ -40,12 +39,10 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
|
|
|
| class Delegate {
|
| public:
|
| - // We call this method after ConfirmInstall()/ConfirmUninstall() to signal
|
| - // that the installation/uninstallation should continue.
|
| + // We call this method to signal that the installation should continue.
|
| virtual void InstallUIProceed() = 0;
|
|
|
| - // We call this method after ConfirmInstall()/ConfirmUninstall() to signal
|
| - // that the installation/uninstallation should stop.
|
| + // We call this method to signal that the installation should stop.
|
| virtual void InstallUIAbort() = 0;
|
|
|
| protected:
|
| @@ -53,23 +50,14 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
|
| };
|
|
|
| explicit ExtensionInstallUI(Profile* profile);
|
| -
|
| virtual ~ExtensionInstallUI();
|
|
|
| // This is called by the installer to verify whether the installation should
|
| // proceed. This is declared virtual for testing.
|
| //
|
| - // We *MUST* eventually call either Proceed() or Abort()
|
| - // on |delegate|.
|
| + // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
|
| virtual void ConfirmInstall(Delegate* delegate, const Extension* extension);
|
|
|
| - // This is called by the extensions management page to verify whether the
|
| - // uninstallation should proceed. This is declared virtual for testing.
|
| - //
|
| - // We *MUST* eventually call either Proceed() or Abort()
|
| - // on |delegate|.
|
| - virtual void ConfirmUninstall(Delegate* delegate, const Extension* extension);
|
| -
|
| // This is called by the app handler launcher to verify whether the app
|
| // should be re-enabled. This is declared virtual for testing.
|
| //
|
| @@ -82,7 +70,7 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
|
| // Installation failed. This is declared virtual for testing.
|
| virtual void OnInstallFailure(const std::string& error);
|
|
|
| - // ImageLoadingTracker::Observer overrides.
|
| + // ImageLoadingTracker::Observer:
|
| virtual void OnImageLoaded(
|
| SkBitmap* image, const ExtensionResource& resource, int index);
|
|
|
| @@ -109,8 +97,10 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
|
| // Returns the delegate to control the browser's info bar. This is
|
| // within its own function due to its platform-specific nature.
|
| static InfoBarDelegate* GetNewThemeInstalledInfoBarDelegate(
|
| - TabContents* tab_contents, const Extension* new_theme,
|
| - const std::string& previous_theme_id, bool previous_use_system_theme);
|
| + TabContents* tab_contents,
|
| + const Extension* new_theme,
|
| + const std::string& previous_theme_id,
|
| + bool previous_use_system_theme);
|
|
|
| Profile* profile_;
|
| MessageLoop* ui_loop_;
|
| @@ -119,11 +109,17 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
|
| std::string previous_theme_id_;
|
| bool previous_use_system_theme_;
|
|
|
| - SkBitmap icon_; // The extensions installation icon.
|
| - const Extension* extension_; // The extension we are showing the UI for.
|
| - Delegate* delegate_; // The delegate we will call Proceed/Abort on after
|
| - // confirmation UI.
|
| - PromptType prompt_type_; // The type of prompt we are going to show.
|
| + // The extensions installation icon.
|
| + SkBitmap icon_;
|
| +
|
| + // The extension we are showing the UI for.
|
| + const Extension* extension_;
|
| +
|
| + // The delegate we will call Proceed/Abort on after confirmation UI.
|
| + Delegate* delegate_;
|
| +
|
| + // The type of prompt we are going to show.
|
| + PromptType prompt_type_;
|
|
|
| // Keeps track of extension images being loaded on the File thread for the
|
| // purpose of showing the install UI.
|
|
|