Eliminate all UI thread decoding of extension images....

chrome/browser/extensions/extension_install_ui.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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_UI_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_UI_H_
 
+#include <string>
+
 #include "base/file_path.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "chrome/browser/extensions/image_loading_tracker.h"
 #include "gfx/native_widget_types.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-#include <string>
-
 class Extension;
 class ExtensionsService;
 class MessageLoop;
 class Profile;
 class InfoBarDelegate;
 class SandboxedExtensionUnpacker;
 class TabContents;
 
 // Displays all the UI around extension installation and uninstallation.
-class ExtensionInstallUI {
+class ExtensionInstallUI : public ImageLoadingTracker::Observer {
  public:
   enum PromptType {
     INSTALL_PROMPT = 0,
     UNINSTALL_PROMPT,
     ENABLE_INCOGNITO_PROMPT,
     NUM_PROMPT_TYPES
   };
 
   // A mapping from PromptType to message ID for various dialog content.
   static const int kTitleIds[NUM_PROMPT_TYPES];
@@ skipping 13 matching lines @@
 
   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|.
-  virtual void ConfirmInstall(Delegate* delegate, Extension* extension,
-                              SkBitmap* icon);
+  virtual void ConfirmInstall(Delegate* delegate, 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, Extension* extension,
-                                SkBitmap* icon);
+  virtual void ConfirmUninstall(Delegate* delegate, 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 ConfirmEnableIncognito(Delegate* delegate, Extension* extension,
-                                      SkBitmap* icon);
+  virtual void ConfirmEnableIncognito(Delegate* delegate, Extension* extension);
 
   // Installation was successful. This is declared virtual for testing.
   virtual void OnInstallSuccess(Extension* extension);
 
   // Installation failed. This is declared virtual for testing.
   virtual void OnInstallFailure(const std::string& error);
 
   // The install was rejected because the same extension/version is already
   // installed. This is declared virtual for testing.
   virtual void OnOverinstallAttempted(Extension* extension);
 
+  // ImageLoadingTracker::Observer overrides.
+  virtual void OnImageLoaded(SkBitmap* image, int index);
+
  private:
   // When a Theme is downloaded it is applied and an info bar is shown to give
   // the user a choice to keep it or undo the installation.
   void ShowThemeInfoBar(Extension* new_theme);
 
 #if defined(OS_MACOSX)
   // When an extension is installed on Mac with neither browser action nor
   // page action icons, show an infobar instead of a popup bubble.
   void ShowGenericExtensionInstalledInfoBar(Extension* new_extension);
 #endif
 
   // Returns the delegate to control the browser's info bar. This is within its
   // own function due to its platform-specific nature.
   InfoBarDelegate* GetNewInfoBarDelegate(Extension* new_theme,
                                          TabContents* tab_contents);
 
   // Implements the showing of the install/uninstall dialog prompt.
   // NOTE: The implementations of this function is platform-specific.
   static void ShowExtensionInstallUIPromptImpl(
       Profile* profile, Delegate* delegate, Extension* extension,
       SkBitmap* icon, const string16& warning_text, PromptType type);
 
   Profile* profile_;
   MessageLoop* ui_loop_;
   std::string previous_theme_id_;  // Used to undo theme installation.
   SkBitmap icon_;  // The extensions installation icon.
+  Extension* extension_;  // The extension we are showing the UI for.
+  Delegate* delegate_;    // The delegate we will call Proceed/Abort on after
+                          // confirmation UI.
+
+  // Keeps track of extension images being loaded on the File thread for the
+  // purpose of showing the install UI.
+  ImageLoadingTracker tracker_;
 
 #if defined(TOOLKIT_GTK)
-  // Also needed to undo theme installation in the linux UI.
+  // Also needed to undo theme installation in the Linux UI.
   bool previous_use_gtk_theme_;
 #endif
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_UI_H_