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

chrome/browser/gtk/options/general_page_gtk.cc

 // 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.
 
 #include "chrome/browser/gtk/options/general_page_gtk.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
-#include "base/gfx/png_decoder.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/gtk/keyword_editor_view.h"
+#include "chrome/browser/gtk/list_store_favicon_loader.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
-#include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Markup for the text showing the current state of the default browser
 const char kDefaultBrowserLabelMarkup[] = "<span color='#%s'>%s</span>";
 
 // Color of the default browser text when Chromium is the default browser
 const char kDefaultBrowserLabelColor[] = "008700";
@@ skipping 156 matching lines @@
       GTK_RADIO_BUTTON(startup_homepage_radio_),
       l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_SHOW_PAGES).c_str());
   g_signal_connect(G_OBJECT(startup_custom_radio_), "toggled",
                    G_CALLBACK(OnStartupRadioToggled), this);
   gtk_box_pack_start(GTK_BOX(vbox), startup_custom_radio_, FALSE, FALSE, 0);
 
   GtkWidget* url_list_container = gtk_hbox_new(FALSE,
                                                gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(vbox), url_list_container, TRUE, TRUE, 0);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  default_favicon_ = rb.GetPixbufNamed(IDR_DEFAULT_FAVICON);
-
   GtkWidget* scroll_window = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
                                       GTK_SHADOW_ETCHED_IN);
   gtk_container_add(GTK_CONTAINER(url_list_container),
                     scroll_window);
   startup_custom_pages_model_ = gtk_list_store_new(COL_COUNT,
                                                    G_TYPE_INT,
@@ skipping 13 matching lines @@
   gtk_tree_view_column_pack_start(column, renderer, TRUE);
   gtk_tree_view_column_add_attribute(column, renderer, "text", COL_URL);
   gtk_tree_view_append_column(GTK_TREE_VIEW(startup_custom_pages_tree_),
                               column);
   startup_custom_pages_selection_ = gtk_tree_view_get_selection(
       GTK_TREE_VIEW(startup_custom_pages_tree_));
   gtk_tree_selection_set_mode(startup_custom_pages_selection_,
                               GTK_SELECTION_MULTIPLE);
   g_signal_connect(G_OBJECT(startup_custom_pages_selection_), "changed",
                    G_CALLBACK(OnStartupPagesSelectionChanged), this);
+  favicon_loader_.reset(new ListStoreFavIconLoader(startup_custom_pages_model_,
+                                                   COL_FAVICON,
+                                                   COL_FAVICON_HANDLE,
+                                                   profile(),
+                                                   &fav_icon_consumer_));
 
   GtkWidget* url_list_buttons = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_end(GTK_BOX(url_list_container), url_list_buttons,
                    FALSE, FALSE, 0);
 
   startup_add_custom_page_button_ = gtk_button_new_with_mnemonic(
       gtk_util::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_ADD_BUTTON)).c_str());
   g_signal_connect(G_OBJECT(startup_add_custom_page_button_), "clicked",
                    G_CALLBACK(OnStartupAddCustomPageClicked), this);
@@ skipping 260 matching lines @@
 void GeneralPageGtk::PopulateCustomUrlList(const std::vector<GURL>& urls) {
   gtk_list_store_clear(startup_custom_pages_model_);
   for (size_t i = 0; i < urls.size(); ++i) {
     GtkTreeIter iter;
     gtk_list_store_append(startup_custom_pages_model_, &iter);
     PopulateCustomUrlRow(urls[i], &iter);
   }
 }
 
 void GeneralPageGtk::PopulateCustomUrlRow(const GURL& url, GtkTreeIter* iter) {
-  HistoryService* history =
-      profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
-  HistoryService::Handle handle(0);
-  if (history) {
-    handle = history->GetFavIconForURL(
-        url, &fav_icon_consumer_,
-        NewCallback(this, &GeneralPageGtk::OnGotFavIcon));
-  }
+  favicon_loader_->LoadFaviconForRow(url, iter);
   gtk_list_store_set(startup_custom_pages_model_, iter,
-                     COL_FAVICON_HANDLE, handle,
-                     COL_FAVICON, default_favicon_,
                      COL_URL, url.spec().c_str(),
                      -1);
 }
 
-bool GeneralPageGtk::GetRowByFavIconHandle(HistoryService::Handle handle,
-                                           GtkTreeIter* result_iter) {
-  GtkTreeIter iter;
-  gboolean valid = gtk_tree_model_get_iter_first(
-      GTK_TREE_MODEL(startup_custom_pages_model_), &iter);
-  while (valid) {
-    gint row_handle;
-    gtk_tree_model_get(GTK_TREE_MODEL(startup_custom_pages_model_), &iter,
-                       COL_FAVICON_HANDLE, &row_handle,
-                       -1);
-    if (row_handle == handle) {
-      *result_iter = iter;
-      return true;
-    }
-    valid = gtk_tree_model_iter_next(
-        GTK_TREE_MODEL(startup_custom_pages_model_), &iter);
-  }
-  return false;
-}
-
-void GeneralPageGtk::OnGotFavIcon(HistoryService::Handle handle,
-                                  bool know_fav_icon,
-                                  scoped_refptr<RefCountedBytes> image_data,
-                                  bool is_expired,
-                                  GURL icon_url) {
-  GtkTreeIter iter;
-  if (!GetRowByFavIconHandle(handle, &iter))
-    return;
-  gtk_list_store_set(startup_custom_pages_model_, &iter,
-                     COL_FAVICON_HANDLE, 0,
-                     -1);
-  if (know_fav_icon && image_data.get() && !image_data->data.empty()) {
-    int width, height;
-    std::vector<unsigned char> decoded_data;
-    if (PNGDecoder::Decode(&image_data->data.front(), image_data->data.size(),
-                           PNGDecoder::FORMAT_BGRA, &decoded_data, &width,
-                           &height)) {
-      SkBitmap icon;
-      icon.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-      icon.allocPixels();
-      memcpy(icon.getPixels(), &decoded_data.front(),
-             width * height * 4);
-      GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
-      gtk_list_store_set(startup_custom_pages_model_, &iter,
-                         COL_FAVICON, pixbuf,
-                         -1);
-      g_object_unref(pixbuf);
-    }
-  }
-}
-
 void GeneralPageGtk::SetCustomUrlListFromCurrentPages() {
   std::vector<GURL> urls;
   for (BrowserList::const_iterator browser_i = BrowserList::begin();
        browser_i != BrowserList::end(); ++browser_i) {
     Browser* browser = *browser_i;
     if (browser->profile() != profile())
       continue;  // Only want entries for open profile.
 
     for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) {
       TabContents* tab = browser->GetTabContentsAt(tab_index);
@@ skipping 159 matching lines @@
     text = l10n_util::GetStringFUTF8(IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT,
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
   char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup,
                                          color, text.c_str());
   gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup);
   g_free(markup);
 
   gtk_widget_set_sensitive(default_browser_use_as_default_button_, !is_default);
 }