| Index: chrome/browser/gtk/list_store_favicon_loader.cc
|
| ===================================================================
|
| --- chrome/browser/gtk/list_store_favicon_loader.cc (revision 22744)
|
| +++ chrome/browser/gtk/list_store_favicon_loader.cc (working copy)
|
| @@ -7,6 +7,7 @@
|
| #include "app/resource_bundle.h"
|
| #include "base/gfx/gtk_util.h"
|
| #include "base/gfx/png_decoder.h"
|
| +#include "chrome/browser/gtk/bookmark_utils_gtk.h"
|
| #include "chrome/browser/profile.h"
|
| #include "grit/app_resources.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| @@ -16,11 +17,14 @@
|
| Profile* profile, CancelableRequestConsumer* consumer)
|
| : list_store_(list_store), favicon_col_(favicon_col),
|
| favicon_handle_col_(favicon_handle_col), profile_(profile),
|
| - consumer_(consumer) {
|
| - ResourceBundle& rb = ResourceBundle::GetSharedInstance();
|
| - default_favicon_ = rb.GetPixbufNamed(IDR_DEFAULT_FAVICON);
|
| + consumer_(consumer),
|
| + default_favicon_(bookmark_utils::GetDefaultFavicon(true)) {
|
| }
|
|
|
| +ListStoreFavIconLoader::~ListStoreFavIconLoader() {
|
| + g_object_unref(default_favicon_);
|
| +}
|
| +
|
| void ListStoreFavIconLoader::LoadFaviconForRow(const GURL& url,
|
| GtkTreeIter* iter) {
|
| HistoryService* history =
|
|
|