diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 17:23:36 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 17:23:36 +0000 |
| commit | 1e7bab7fc3f214061e216722e7879c7e1580059a (patch) | |
| tree | 88f2b82fa0d0c2afd3f85b544b650a73a04c5978 /chrome/browser/gtk/bookmark_bar_gtk.cc | |
| parent | 0c9ee9904acbfe0766f488edb207ff232635efd3 (diff) | |
| download | chromium_src-1e7bab7fc3f214061e216722e7879c7e1580059a.zip chromium_src-1e7bab7fc3f214061e216722e7879c7e1580059a.tar.gz chromium_src-1e7bab7fc3f214061e216722e7879c7e1580059a.tar.bz2 | |
Linux bookmark manager first cut.
Also add icons to bookmark tree model.
Review URL: http://codereview.chromium.org/118150
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 577105a..4a9e904 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -15,6 +15,7 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" #include "chrome/browser/gtk/bookmark_menu_controller_gtk.h" +#include "chrome/browser/gtk/bookmark_tree_model.h" #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/dnd_registry.h" #include "chrome/browser/gtk/gtk_chrome_button.h" @@ -408,18 +409,12 @@ void BookmarkBarGtk::ConfigureButtonForNode(BookmarkNode* node, gtk_image_new_from_pixbuf(pixbuf)); g_object_unref(pixbuf); } else { - ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - static GdkPixbuf* default_bookmark_icon = rb.GetPixbufNamed( - IDR_DEFAULT_FAVICON); - gtk_button_set_image(GTK_BUTTON(button), - gtk_image_new_from_pixbuf(default_bookmark_icon)); + gtk_button_set_image(GTK_BUTTON(button), + gtk_image_new_from_pixbuf(bookmark_utils::GetFolderIcon())); } } else { - ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - static GdkPixbuf* default_bookmark_icon = rb.GetPixbufNamed( - IDR_BOOKMARK_BAR_FOLDER); gtk_button_set_image(GTK_BUTTON(button), - gtk_image_new_from_pixbuf(default_bookmark_icon)); + gtk_image_new_from_pixbuf(bookmark_utils::GetDefaultFavicon())); } SetButtonTextColors(button); |