Add a class to replace ImageLoadingTracker with a nicer API.

chrome/browser/background/background_application_list_model.cc

 // 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.
 
 #include "chrome/browser/background/background_application_list_model.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/image_loading_tracker.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/l10n/l10n_util_collator.h"
@@ skipping 23 matching lines @@
 bool ExtensionNameComparator::operator()(const Extension* x,
                                          const Extension* y) {
   return l10n_util::StringComparator<string16>(collator_)(
     UTF8ToUTF16(x->name()),
     UTF8ToUTF16(y->name()));
 }
 
 // Background application representation, private to the
 // BackgroundApplicationListModel class.
 class BackgroundApplicationListModel::Application
-  : public ImageLoadingTracker::Observer {
+    : public base::SupportsWeakPtr<Application> {
  public:
   Application(BackgroundApplicationListModel* model,
               const Extension* an_extension);
 
   virtual ~Application();
 
   // Invoked when a request icon is available.
-  virtual void OnImageLoaded(const gfx::Image& image,
-                             const std::string& extension_id,
-                             int index) OVERRIDE;
+  void OnImageLoaded(const gfx::Image& image);
 
   // Uses the FILE thread to request this extension's icon, sized
   // appropriately.
   void RequestIcon(extension_misc::ExtensionIcons size);
 
   const Extension* extension_;
   scoped_ptr<gfx::ImageSkia> icon_;
   BackgroundApplicationListModel* model_;
-  ImageLoadingTracker tracker_;
 };
 
 namespace {
 void GetServiceApplications(ExtensionService* service,
                             ExtensionList* applications_result) {
   const ExtensionSet* extensions = service->extensions();
 
   for (ExtensionSet::const_iterator cursor = extensions->begin();
        cursor != extensions->end();
        ++cursor) {
@@ skipping 41 matching lines @@
 }
 
 BackgroundApplicationListModel::Application::~Application() {
 }
 
 BackgroundApplicationListModel::Application::Application(
     BackgroundApplicationListModel* model,
     const Extension* extension)
     : extension_(extension),
       icon_(NULL),
-      model_(model),
-      ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
+      model_(model) {
 }
 
 void BackgroundApplicationListModel::Application::OnImageLoaded(
-    const gfx::Image& image,
-    const std::string& extension_id,
-    int index) {
+    const gfx::Image& image) {
   if (image.IsEmpty())
     return;
   icon_.reset(image.CopyImageSkia());
   model_->SendApplicationDataChangedNotifications(extension_);
 }
 
 void BackgroundApplicationListModel::Application::RequestIcon(
     extension_misc::ExtensionIcons size) {
   ExtensionResource resource = extension_->GetIconResource(
       size, ExtensionIconSet::MATCH_BIGGER);
-  tracker_.LoadImage(extension_, resource, gfx::Size(size, size),
-                     ImageLoadingTracker::CACHE);
+  extensions::ExtensionSystem::Get(model_->profile_)->
+      image_loader()->LoadImageAsync(
+          extension_, resource, gfx::Size(size, size),
+          base::Bind(&Application::OnImageLoaded, AsWeakPtr()));
 }
 
 BackgroundApplicationListModel::~BackgroundApplicationListModel() {
   STLDeleteContainerPairSecondPointers(applications_.begin(),
                                        applications_.end());
 }
 
 BackgroundApplicationListModel::BackgroundApplicationListModel(Profile* profile)
     : profile_(profile) {
   DCHECK(profile_);
@@ skipping 235 matching lines @@
          (*old_cursor)->name() == (*new_cursor)->name() &&
          (*old_cursor)->id() == (*new_cursor)->id()) {
     ++old_cursor;
     ++new_cursor;
   }
   if (old_cursor != extensions_.end() || new_cursor != extensions.end()) {
     extensions_ = extensions;
     FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged(profile_));
   }
 }