Use ImageLoader instead of ImageLoadingTracker (Part 9)

chrome/browser/ui/panels/panel.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/ui/panels/panel.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel_collection.h"
 #include "chrome/browser/ui/panels/panel_host.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
@@ skipping 114 matching lines @@
       collection_(NULL),
       initialized_(false),
       min_size_(min_size),
       max_size_(max_size),
       max_size_policy_(DEFAULT_MAX_SIZE),
       auto_resizable_(false),
       in_preview_mode_(false),
       native_panel_(NULL),
       attention_mode_(USE_PANEL_ATTENTION),
       expansion_state_(EXPANDED),
-      command_updater_(this) {
+      command_updater_(this),
+      ALLOW_THIS_IN_INITIALIZER_LIST(image_loader_ptr_factory_(this)) {
 }
 
 Panel::~Panel() {
   DCHECK(!collection_);
   // Invoked by native panel destructor. Do not access native_panel_ here.
   browser::EndKeepAlive();  // Remove shutdown prevention.
 }
 
 void Panel::Initialize(Profile* profile, const GURL& url,
                        const gfx::Rect& bounds) {
@@ skipping 54 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_COPY, true);
   command_updater_.UpdateCommandEnabled(IDC_CUT, true);
   command_updater_.UpdateCommandEnabled(IDC_PASTE, true);
 
   // DevTools
   command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, true);
   command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, true);
 }
 
 void Panel::OnNativePanelClosed() {
-  app_icon_loader_.reset();
+  // Ensure previously enqueued OnImageLoaded callbacks are ignored.
+  image_loader_ptr_factory_.InvalidateWeakPtrs();
   registrar_.RemoveAll();
   manager()->OnPanelClosed(this);
   DCHECK(!collection_);
 }
 
 PanelManager* Panel::manager() const {
   return PanelManager::GetInstance();
 }
 
 CommandUpdater* Panel::command_updater() {
@@ skipping 584 matching lines @@
   if (!extension_service || !extension_service->is_ready())
     return NULL;
   return extension_service->GetExtensionById(extension_id(), false);
 }
 
 void Panel::UpdateAppIcon() {
   const extensions::Extension* extension = GetExtension();
   if (!extension)
     return;
 
-  app_icon_loader_.reset(new ImageLoadingTracker(this));
-  app_icon_loader_->LoadImage(
+  extensions::ImageLoader* loader = extensions::ImageLoader::Get(profile());
+  loader->LoadImageAsync(
       extension,
       extension->GetIconResource(extension_misc::EXTENSION_ICON_SMALL,
                                  ExtensionIconSet::MATCH_BIGGER),
       gfx::Size(extension_misc::EXTENSION_ICON_SMALL,
                 extension_misc::EXTENSION_ICON_SMALL),
-      ImageLoadingTracker::CACHE);
+      base::Bind(&Panel::OnImageLoaded,
+                 image_loader_ptr_factory_.GetWeakPtr()));
 }
 
-void Panel::OnImageLoaded(const gfx::Image& image,
-                          const std::string& extension_id,
-                          int index) {
+void Panel::OnImageLoaded(const gfx::Image& image) {
   if (!image.IsEmpty()) {
     app_icon_ = image;
     native_panel_->UpdatePanelTitleBar();
   }
-  app_icon_loader_.reset();
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_APP_ICON_LOADED,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }