Refactor the favicon loader out of gtk/options/general_page_gtk to gtk/list_store_favicon_loader,

chrome/browser/gtk/options/general_page_gtk.h

 // Copyright (c) 2006-2009 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_GTK_OPTIONS_GENERAL_PAGE_GTK_H_
 #define CHROME_BROWSER_GTK_OPTIONS_GENERAL_PAGE_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
-#include "chrome/browser/history/history.h"
+#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/options_page_base.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/pref_member.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
+class ListStoreFavIconLoader;
 
 class GeneralPageGtk : public OptionsPageBase,
                        public TemplateURLModelObserver {
  public:
   explicit GeneralPageGtk(Profile* profile);
   ~GeneralPageGtk();
 
   GtkWidget* get_page_widget() const {
     return page_;
   }
@@ skipping 11 matching lines @@
 
   // Saves the startup preference from the values in the ui
   void SaveStartupPref();
 
   // Fill the startup_custom_pages_model_
   void PopulateCustomUrlList(const std::vector<GURL>& urls);
 
   // Fill a single row in the startup_custom_pages_model_
   void PopulateCustomUrlRow(const GURL& url, GtkTreeIter *iter);
 
-  // Find a row from the GetFavIconForURL handle.  Returns true if the row was
-  // found.
-  bool GetRowByFavIconHandle(HistoryService::Handle handle,
-                             GtkTreeIter* result_iter);
-
-  // Callback from HistoryService:::GetFavIconForURL
-  void OnGotFavIcon(HistoryService::Handle handle, bool know_fav_icon,
-                    scoped_refptr<RefCountedBytes> image_data, bool is_expired,
-                    GURL icon_url);
-
   // Set the custom url list using the pages currently open
   void SetCustomUrlListFromCurrentPages();
 
   // Callback from UrlPickerDialogGtk, for adding custom urls manually.
   // If a single row in the list is selected, the new url will be inserted
   // before that row.  Otherwise the new row will be added to the end.
   void OnAddCustomUrl(const GURL& url);
 
   // Removes urls that are currently selected
   void RemoveSelectedCustomUrls();
@@ skipping 103 matching lines @@
   // Flag to ignore gtk callbacks while we are populating default search urls.
   bool default_search_initializing_;
 
   // Flag to ignore gtk callbacks while we are loading prefs, to avoid
   // then turning around and saving them again.
   bool initializing_;
 
   // Used in loading favicons.
   CancelableRequestConsumer fav_icon_consumer_;
 
-  // Default icon to show when one can't be found for the URL.  This is owned by
-  // the ResourceBundle and we do not need to free it.
-  GdkPixbuf* default_favicon_;
+  // Helper to load the favicon pixbufs into the |startup_custom_pages_model_|.
+  scoped_ptr<ListStoreFavIconLoader> favicon_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(GeneralPageGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_OPTIONS_GENERAL_PAGE_GTK_H_