Factoring out of FaviconLoader

chrome/browser/ui/intents/web_intent_picker_controller.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_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/extensions/webstore_installer.h"
-#include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/intents/cws_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_reporting.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "content/public/browser/download_id.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/web_intent_reply_data.h"
 #include "webkit/glue/web_intent_service_data.h"
 
 class Browser;
 struct DefaultWebIntentService;
 class GURL;
 class Profile;
 class WebIntentPicker;
 class WebIntentPickerModel;
 
 namespace content {
 class WebContents;
 class WebIntentsDispatcher;
 }
 
 namespace web_intents {
 class NativeServiceFactory;
+class IconLoader;
 }
 
 namespace webkit_glue {
 struct WebIntentServiceData;
 }
 
 // Controls the creation of the WebIntentPicker UI and forwards the user's
 // intent handler choice back to the WebContents object.
 class WebIntentPickerController
     : public WebIntentPickerDelegate,
@@ skipping 149 matching lines @@
   // default choices allow it to be skipped.
   void RegistryCallsCompleted();
 
   // Called when WebIntentServiceData is ready for checking extensions
   // when dispatching explicit intents. Gets |services|
   // from the WebIntentsRegistry to check for known urls/extensions and find
   // disposition data.
   void OnWebIntentServicesAvailableForExplicitIntent(
       const std::vector<webkit_glue::WebIntentServiceData>& services);
 
-  // Called when a favicon is returned from the FaviconService.
-  void OnFaviconDataAvailable(
-      FaviconService::Handle handle,
-      const history::FaviconImageResult& image_result);
-
   // Called when IntentExtensionInfo is returned from the CWSIntentsRegistry.
   void OnCWSIntentServicesAvailable(
       const CWSIntentsRegistry::IntentExtensionList& extensions);
 
   // Called when a suggested extension's icon is fetched.
   void OnExtensionIconURLFetchComplete(const std::string& extension_id,
                                        const net::URLFetcher* source);
 
   // Called whenever intent data (both from registry and CWS) arrives.
   void OnIntentDataArrived();
@@ skipping 109 matching lines @@
   content::WebIntentsDispatcher* intents_dispatcher_;
 
   // Saves whether the use-another-service button has been
   // animated on the location bar.
   bool location_bar_button_indicated_;
 
   // Weak pointer to the tab servicing the intent. Remembered in order to
   // close it when a reply is sent.
   content::WebContents* service_tab_;
 
-  // Request consumer used when asynchronously loading favicons.
-  CancelableRequestConsumerTSimple<size_t> favicon_consumer_;
+  // Object managing the details of icon loading.

[James Hawkins, 2012/10/17 03:38:39]

Object that manages the details...

+  scoped_ptr<web_intents::IconLoader> icon_loader_;
 
   // Factory for weak pointers used in callbacks for async calls to load the
   // picker model.
   base::WeakPtrFactory<WebIntentPickerController> weak_ptr_factory_;
 
   // Timer factory for minimum display time of "waiting" dialog.
   base::WeakPtrFactory<WebIntentPickerController> timer_factory_;
 
   // Weak pointers for the dispatcher OnSendReturnMessage will not be
   // cancelled on picker close.
   base::WeakPtrFactory<WebIntentPickerController> dispatcher_factory_;
 
   // Bucket identifier for UMA reporting. Saved off in a field
   // to avoid repeated calculation of the bucket across
   // multiple UMA calls. Should be recalculated each time
   // |intents_dispatcher_| is set.
   web_intents::UMABucket uma_bucket_;
 
   // Factory used to obtain instance of native services.
   scoped_ptr<web_intents::NativeServiceFactory> native_services_;
 
   // The ID of a pending extension download.
   content::DownloadId download_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController);
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_