Adds support for models to provide addition icons to the tree. Updates

the bookmarks folder tree model to return custom icons for search and
recently bookmarked.

BUG=674
TEST=none

Review URL: http://codereview.chromium.org/9047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4556 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 24 insertions, 1 deletions

diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
index b1932a4..d5d8038 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 
+#include "chrome/app/theme/theme_resources.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/resource_bundle.h"
 
 #include "generated_resources.h"
 
@@ -129,6 +131,22 @@ void BookmarkFolderTreeModel::BookmarkNodeChanged(BookmarkModel* model,
     GetObserver()->TreeNodeChanged(this, folder_node);
 }
 
+void BookmarkFolderTreeModel::GetIcons(std::vector<SkBitmap>* icons) {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  icons->push_back(*rb.GetBitmapNamed(IDR_BOOKMARK_MANAGER_RECENT_ICON));
+  icons->push_back(*rb.GetBitmapNamed(IDR_BOOKMARK_MANAGER_SEARCH_ICON));
+}
+
+int BookmarkFolderTreeModel::GetIconIndex(views::TreeModelNode* node) {
+  if (node == recently_bookmarked_node_)
+    return 0;
+  if (node == search_node_)
+    return 1;
+
+  // Return -1 to use the default.
+  return -1;
+}
+
 void BookmarkFolderTreeModel::AddRootChildren() {
   Add(AsNode(GetRoot()), 0, CreateFolderNode(model_->GetBookmarkBarNode()));
   Add(AsNode(GetRoot()), 1, CreateFolderNode(model_->other_node()));
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.h b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
index c2f7093..acf49f4 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.h
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
@@ -68,7 +68,12 @@ class BookmarkFolderTreeModel : public views::TreeNodeModel<FolderNode>,
   virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                          BookmarkNode* node) {}
 
- private:
+  // The following are overriden to return custom icons for the recently
+  // bookmarked and search nodes.
+  virtual void GetIcons(std::vector<SkBitmap>* icons);
+  virtual int GetIconIndex(views::TreeModelNode* node);
+
+private:
   // Invoked from the constructor to create the children of the root node.
   void AddRootChildren();