Add a class to replace ImageLoadingTracker with a nicer API.

chrome/browser/ui/webui/extensions/extension_icon_source.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_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/extensions/extension_icon_set.h"
+#include "chrome/common/extensions/extension_resource.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class ExtensionIconSet;
 class Profile;
 
 namespace extensions {
 class Extension;
 }
 
 // ExtensionIconSource serves extension icons through network level chrome:
@@ skipping 15 matching lines @@
 //   chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/32/1?grayscale=true
 //     (ICON_SMALL, MATCH_BIGGER, grayscale)
 //   chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/128/0
 //     (ICON_LARGE, MATCH_EXACTLY)
 //
 // We attempt to load icons from the following sources in order:
 //  1) The icons as listed in the extension / app manifests.
 //  2) If a 16px icon was requested, the favicon for extension's launch URL.
 //  3) The default extension / application icon if there are still no matches.
 //
-class ExtensionIconSource : public ChromeURLDataManager::DataSource,
-                            public ImageLoadingTracker::Observer {
+class ExtensionIconSource : public ChromeURLDataManager::DataSource {
  public:
   explicit ExtensionIconSource(Profile* profile);
 
   // Gets the URL of the |extension| icon in the given |icon_size|, falling back
   // based on the |match| type. If |grayscale|, the URL will be for the
   // desaturated version of the icon. |exists|, if non-NULL, will be set to true
   // if the icon exists; false if it will lead to a default or not-present
   // image.
   static GURL GetIconURL(const extensions::Extension* extension,
                          int icon_size,
@@ skipping 39 matching lines @@
 
   // Loads the favicon image for the app associated with the |request_id|. If
   // the image does not exist, we fall back to the default image.
   void LoadFaviconImage(int request_id);
 
   // FaviconService callback
   void OnFaviconDataAvailable(
       FaviconService::Handle request_handle,
       const history::FaviconBitmapResult& bitmap_result);
 
-  // ImageLoadingTracker::Observer
-  virtual void OnImageLoaded(const gfx::Image& image,
-                             const std::string& extension_id,
-                             int id) OVERRIDE;
+  // ImageLoader callback
+  void OnImageLoaded(int request_id, const gfx::Image& image);
 
   // Called when the extension doesn't have an icon. We fall back to multiple
   // sources, using the following order:
   //  1) The icons as listed in the extension / app manifests.
   //  2) If a 16px icon and the extension has a launch URL, see if Chrome
   //     has a corresponding favicon.
   //  3) If still no matches, load the default extension / application icon.
   void LoadIconFailed(int request_id);
 
   // Parses and savse an ExtensionIconRequest for the URL |path| for the
@@ skipping 18 matching lines @@
   void ClearData(int request_id);
 
   Profile* profile_;
 
   // Maps tracker ids to request ids.
   std::map<int, int> tracker_map_;
 
   // Maps request_ids to ExtensionIconRequests.
   std::map<int, ExtensionIconRequest*> request_map_;
 
-  scoped_ptr<ImageLoadingTracker> tracker_;
-
-  int next_tracker_id_;
-
   scoped_ptr<SkBitmap> default_app_data_;
 
   scoped_ptr<SkBitmap> default_extension_data_;
 
   CancelableRequestConsumerT<int, 0> cancelable_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_