Factoring out of FaviconLoader

chrome/browser/ui/intents/web_intent_picker_controller.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/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/platform_app_launcher.h"
 #include "chrome/browser/extensions/webstore_installer.h"
-#include "chrome/browser/favicon/favicon_service.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/intents/cws_intents_registry_factory.h"
 #include "chrome/browser/intents/default_web_intent_service.h"
 #include "chrome/browser/intents/intent_service_host.h"
 #include "chrome/browser/intents/native_services.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/intents/web_intents_reporting.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
+#include "chrome/browser/ui/intents/web_intent_icon_loader.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
@@ skipping 12 matching lines @@
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebIntentPickerController)
 
 namespace {
 
 // Maximum amount of time to delay displaying dialog while waiting for data.
 const int kMaxHiddenSetupTimeMs = 200;
 
 // Minimum amount of time to show waiting dialog, if it is shown.
 const int kMinThrobberDisplayTimeMs = 800;
 
-
-// Gets the favicon service for the specified profile.
-FaviconService* GetFaviconService(Profile* profile) {
-  return FaviconServiceFactory::GetForProfile(profile,
-                                              Profile::EXPLICIT_ACCESS);
-}
-
 // Gets the web intents registry for the specified profile.
 WebIntentsRegistry* GetWebIntentsRegistry(Profile* profile) {
   return WebIntentsRegistryFactory::GetForProfile(profile);
 }
 
 // Gets the Chrome web store intents registry for the specified profile.
 CWSIntentsRegistry* GetCWSIntentsRegistry(Profile* profile) {
   return CWSIntentsRegistryFactory::GetForProfile(profile);
 }
 
@@ skipping 21 matching lines @@
 URLFetcherTrampoline::~URLFetcherTrampoline() {
 }
 
 void URLFetcherTrampoline::OnURLFetchComplete(
     const net::URLFetcher* source) {
   DCHECK(!callback_.is_null());
   callback_.Run(source);
   delete source;
   delete this;
 }
-
 class SourceWindowObserver : content::WebContentsObserver {
  public:
   SourceWindowObserver(content::WebContents* web_contents,
                        base::WeakPtr<WebIntentPickerController> controller)
       : content::WebContentsObserver(web_contents),
         controller_(controller) {}
   virtual ~SourceWindowObserver() {}
 
   // Implement WebContentsObserver
   virtual void WebContentsDestroyed(content::WebContents* web_contents) {
@@ skipping 53 matching lines @@
       picker_model_(new WebIntentPickerModel()),
       uma_reporter_(new UMAReporter()),
       pending_async_count_(0),
       pending_registry_calls_count_(0),
       pending_cws_request_(false),
       picker_shown_(false),
       window_disposition_source_(NULL),
       source_intents_dispatcher_(NULL),
       intents_dispatcher_(NULL),
       service_tab_(NULL),
+      icon_loader_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(timer_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(dispatcher_factory_(this)) {
   native_services_.reset(new web_intents::NativeServiceFactory());
 #if defined(TOOLKIT_VIEWS)
   cancelled_ = true;
 #endif
+  icon_loader_.reset(
+      new web_intents::IconLoader(profile_, picker_model_.get()));
 }
 
 WebIntentPickerController::~WebIntentPickerController() {
 }
 
 // TODO(gbillock): combine this with ShowDialog.
 void WebIntentPickerController::SetIntentsDispatcher(
     content::WebIntentsDispatcher* intents_dispatcher) {
   // TODO(gbillock): This is to account for multiple dispatches in the same tab.
   // That is currently not a well-handled case, and this is a band-aid.
@@ skipping 399 matching lines @@
       }
     }
     service_tab_ = NULL;
   }
 
   intents_dispatcher_ = NULL;
 }
 
 void WebIntentPickerController::AddServiceToModel(
     const webkit_glue::WebIntentServiceData& service) {
-  FaviconService* favicon_service = GetFaviconService(profile_);
 
   picker_model_->AddInstalledService(
       service.title,
       service.service_url,
       service.disposition);
 
-  pending_async_count_++;
-  FaviconService::Handle handle = favicon_service->GetFaviconImageForURL(
-      FaviconService::FaviconForURLParams(
-          profile_,
-          service.service_url,
-          history::FAVICON,
-          gfx::kFaviconSize,
-          &favicon_consumer_),
-      base::Bind(
-          &WebIntentPickerController::OnFaviconDataAvailable,
-          weak_ptr_factory_.GetWeakPtr()));
-  favicon_consumer_.SetClientData(
-      favicon_service, handle, picker_model_->GetInstalledServiceCount() - 1);
+  icon_loader_->LoadFavicon(service.service_url);
 }
 
 void WebIntentPickerController::OnWebIntentServicesAvailable(
     const std::vector<webkit_glue::WebIntentServiceData>& services) {
   for (size_t i = 0; i < services.size(); ++i)
     AddServiceToModel(services[i]);
 
   RegistryCallsCompleted();
   AsyncOperationFinished();
 }
@@ skipping 44 matching lines @@
     if (default_service != NULL) {
       InvokeService(*default_service);
       return;
     }
   }
 
   OnPickerEvent(kPickerEventRegistryDataComplete);
   OnIntentDataArrived();
 }
 
-void WebIntentPickerController::OnFaviconDataAvailable(
-    FaviconService::Handle handle,
-    const history::FaviconImageResult& image_result) {
-  size_t index = favicon_consumer_.GetClientDataForCurrentRequest();
-  if (!image_result.image.IsEmpty()) {
-    picker_model_->UpdateFaviconAt(index, image_result.image);
-    return;
-  }
-
-  AsyncOperationFinished();
-}
-
 void WebIntentPickerController::OnCWSIntentServicesAvailable(
     const CWSIntentsRegistry::IntentExtensionList& extensions) {
   ExtensionServiceInterface* extension_service =
       profile_->GetExtensionService();
 
   std::vector<WebIntentPickerModel::SuggestedExtension> suggestions;
   for (size_t i = 0; i < extensions.size(); ++i) {
     const CWSIntentsRegistry::IntentExtensionInfo& info = extensions[i];
 
     // Do not include suggestions for already installed extensions.
@@ skipping 83 matching lines @@
   // Abandon all callbacks.
   weak_ptr_factory_.InvalidateWeakPtrs();
   timer_factory_.InvalidateWeakPtrs();
 
   // Reset state associated with callbacks.
   pending_async_count_ = 0;
   pending_registry_calls_count_ = 0;
   pending_cws_request_ = false;
 
   // Reset picker.
+  icon_loader_.reset();
   picker_model_.reset(new WebIntentPickerModel());
+  icon_loader_.reset(
+      new web_intents::IconLoader(profile_, picker_model_.get()));
+
   picker_shown_ = false;
 
   DCHECK(web_contents_);
   ConstrainedWindowTabHelper* constrained_window_tab_helper =
       ConstrainedWindowTabHelper::FromWebContents(web_contents_);
   constrained_window_tab_helper->BlockTabContent(false);
 }
 
 // static
 void WebIntentPickerController::DecodeExtensionIconAndResize(
@@ skipping 286 matching lines @@
   content::DownloadManager* download_manager =
       content::BrowserContext::GetDownloadManager(profile);
   if (!download_manager)
     return;
   content::DownloadItem* item =
       download_manager->GetDownload(download_id_.local());
   if (item)
     item->Cancel(true);
   download_id_ = content::DownloadId();
 }