Add a class to replace ImageLoadingTracker with a nicer API.

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/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"
 #include "ui/gfx/native_widget_types.h"
 
 class Browser;
 class ExtensionInstallUI;
 class InfoBarDelegate;
 class MessageLoop;
 class Profile;
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace content {
 class PageNavigator;
 }
 
 namespace extensions {
 class BundleInstaller;
 class Extension;
 class ExtensionWebstorePrivateApiTest;
 class PermissionSet;
 }  // namespace extensions
 
 // Displays all the UI around extension installation.
-class ExtensionInstallPrompt : public ImageLoadingTracker::Observer,
-                               public OAuth2MintTokenFlow::Delegate {
+class ExtensionInstallPrompt : public OAuth2MintTokenFlow::Delegate,
+    public base::SupportsWeakPtr<ExtensionInstallPrompt> {

[Finnur, 2012/10/05 14:41:33]

If the second doesn't fit within 80 cols when aligned with the other public,
then I'd move the first public down one line so you can align them.

[Marijn Kruisselbrink, 2012/10/05 18:00:08]

Done.

  public:
   enum PromptType {
     UNSET_PROMPT_TYPE = -1,
     INSTALL_PROMPT = 0,
     INLINE_INSTALL_PROMPT,
     BUNDLE_INSTALL_PROMPT,
     RE_ENABLE_PROMPT,
     PERMISSIONS_PROMPT,
     NUM_PROMPT_TYPES
   };
@@ skipping 176 matching lines @@
                                   const extensions::Extension* extension,
                                   const IssueAdviceInfo& issue_advice);
 
   // Installation was successful. This is declared virtual for testing.
   virtual void OnInstallSuccess(const extensions::Extension* extension,
                                 SkBitmap* icon);
 
   // Installation failed. This is declared virtual for testing.
   virtual void OnInstallFailure(const extensions::CrxInstallerError& error);
 
-  // ImageLoadingTracker::Observer:
-  virtual void OnImageLoaded(const gfx::Image& image,
-                             const std::string& extension_id,
-                             int index) OVERRIDE;
+  // extension_image_utils callback.
+  void OnImageLoaded(const gfx::Image& image);

[Finnur, 2012/10/05 14:41:33]

Is there a reason to keep these public? Can you not bind against them if they
are private? I think the only reason they were public was because of an old
Chrome team rule: one shouldn't change the visibility of functions while
overriding them (inheriting a public function, the override should be public).

[Aaron Boodman, 2012/10/05 16:46:03]

I did not know about that rule. I very frequently do the opposite.

[Marijn Kruisselbrink, 2012/10/05 18:00:08]

Done.

 
  protected:
   friend class extensions::ExtensionWebstorePrivateApiTest;
   friend class WebstoreInlineInstallUnpackFailureTest;
   friend class MockGetAuthTokenFunction;
 
   // Whether or not we should record the oauth2 grant upon successful install.
   bool record_oauth2_grant_;
 
  private:
@@ skipping 43 matching lines @@
   // The delegate we will call Proceed/Abort on after confirmation UI.
   Delegate* delegate_;
 
   // A pre-filled prompt.
   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_;
 };
 
 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_