Add a class to replace ImageLoadingTracker with a nicer API.

chrome/browser/extensions/extension_install_prompt.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/extensions/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ skipping 341 matching lines @@
 }
 
 ExtensionInstallPrompt::ExtensionInstallPrompt(
     content::WebContents* contents)
     : record_oauth2_grant_(false),
       parent_web_contents_(contents),
       ui_loop_(MessageLoop::current()),
       extension_(NULL),
       install_ui_(ExtensionInstallUI::Create(ProfileForWebContents(contents))),
       delegate_(NULL),
-      prompt_(ProfileForWebContents(contents), UNSET_PROMPT_TYPE),
-      prompt_type_(UNSET_PROMPT_TYPE),
-      ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
+      profile_(ProfileForWebContents(contents)),
+      prompt_(profile_, UNSET_PROMPT_TYPE),
+      prompt_type_(UNSET_PROMPT_TYPE) {
 }
 
 ExtensionInstallPrompt::~ExtensionInstallPrompt() {
 }
 
 void ExtensionInstallPrompt::ConfirmBundleInstall(
     extensions::BundleInstaller* bundle,
     const PermissionSet* permissions) {
   DCHECK(ui_loop_ == MessageLoop::current());
   bundle_ = bundle;
@@ skipping 130 matching lines @@
   else
     icon_ = SkBitmap();
   if (icon_.empty()) {
     // Let's set default icon bitmap whose size is equal to the default icon's
     // pixel size under maximal supported scale factor. If the bitmap is larger
     // than the one we need, it will be scaled down by the ui code.
     icon_ = GetDefaultIconBitmapForMaxScaleFactor(extension_->is_app());
   }
 }
 
-void ExtensionInstallPrompt::OnImageLoaded(const gfx::Image& image,
-                                           const std::string& extension_id,
-                                           int index) {
+void ExtensionInstallPrompt::OnImageLoaded(const gfx::Image& image) {
   SetIcon(image.IsEmpty() ? NULL : image.ToSkBitmap());
   FetchOAuthIssueAdviceIfNeeded();
 }
 
 void ExtensionInstallPrompt::LoadImageIfNeeded() {
   // Bundle install prompts do not have an icon.
   if (!icon_.empty()) {
     FetchOAuthIssueAdviceIfNeeded();
     return;
   }
 
   // Load the image asynchronously. For the response, check OnImageLoaded.
   ExtensionResource image =
       extension_->GetIconResource(extension_misc::EXTENSION_ICON_LARGE,
                                   ExtensionIconSet::MATCH_BIGGER);
   // Load the icon whose pixel size is large enough to be displayed under
   // maximal supported scale factor. UI code will scale the icon down if needed.
   // TODO(tbarzic): We should use IconImage here and load the required bitmap
   //     lazily.
   int pixel_size = GetSizeForMaxScaleFactor(kIconSize);
-  tracker_.LoadImage(extension_, image,
-                     gfx::Size(pixel_size, pixel_size),
-                     ImageLoadingTracker::DONT_CACHE);
+  extensions::ExtensionSystem::Get(profile_)->image_loader()->LoadImageAsync(

[Aaron Boodman, 2012/10/31 07:38:22]

I think ImageLoader should be its own PKS, not owned by ExtensionSystem.

[Marijn Kruisselbrink, 2012/10/31 21:22:59]

Done.

+      extension_, image, gfx::Size(pixel_size, pixel_size),
+      base::Bind(&ExtensionInstallPrompt::OnImageLoaded, AsWeakPtr()));
 }
 
 void ExtensionInstallPrompt::FetchOAuthIssueAdviceIfNeeded() {
   // |extension_| may be NULL, e.g. in the bundle install case.
   if (!extension_ ||
       prompt_type_ == BUNDLE_INSTALL_PROMPT ||
       prompt_type_ == INLINE_INSTALL_PROMPT ||
       prompt_type_ == EXTERNAL_INSTALL_PROMPT ||
       prompt_.GetOAuthIssueCount() != 0U) {
     ShowConfirmation();
@@ skipping 65 matching lines @@
   if (AutoConfirmPrompt(delegate_))
     return;
 
   if (show_dialog_callback_.is_null()) {
     GetDefaultShowDialogCallback().Run(
         parent_web_contents_, delegate_, prompt_);
   } else {
     show_dialog_callback_.Run(parent_web_contents_, delegate_, prompt_);
   }
 }