bookmarks: Hide some methods from BookmarNode that are not interesting outside to clients.

R=sky@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10535123

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

1 files changed, 12 insertions, 18 deletions

diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 7ec957c..7d9bdfb7 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -96,25 +96,7 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> {
   bool is_folder() const { return type_ != URL; }
   bool is_url() const { return type_ == URL; }
 
-  // Returns the favicon. In nearly all cases you should use the method
-  // BookmarkModel::GetFavicon rather than this. BookmarkModel::GetFavicon
-  // takes care of loading the favicon if it isn't already loaded, where as
-  // this does not.
-  const SkBitmap& favicon() const { return favicon_; }
-  void set_favicon(const SkBitmap& icon) { favicon_ = icon; }
-
-  // The following methods are used by the bookmark model, and are not
-  // really useful outside of it.
-
   bool is_favicon_loaded() const { return is_favicon_loaded_; }
-  void set_is_favicon_loaded(bool loaded) { is_favicon_loaded_ = loaded; }
-
-  HistoryService::Handle favicon_load_handle() const {
-    return favicon_load_handle_;
-  }
-  void set_favicon_load_handle(HistoryService::Handle handle) {
-    favicon_load_handle_ = handle;
-  }
 
   // Accessor method for controlling the visibility of a bookmark node/sub-tree.
   // Note that visibility is not propagated down the tree hierarchy so if a
@@ -135,6 +117,18 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> {
   // Called when the favicon becomes invalid.
   void InvalidateFavicon();
 
+  const SkBitmap& favicon() const { return favicon_; }
+  void set_favicon(const SkBitmap& icon) { favicon_ = icon; }
+
+  void set_is_favicon_loaded(bool loaded) { is_favicon_loaded_ = loaded; }
+
+  HistoryService::Handle favicon_load_handle() const {
+    return favicon_load_handle_;
+  }
+  void set_favicon_load_handle(HistoryService::Handle handle) {
+    favicon_load_handle_ = handle;
+  }
+
   // The unique identifier for this node.
   int64 id_;