bookmarks: Rename |loaded_favicon_| to |is_favicon_loaded_| so it matches with the getter accessor.

Updates the setter as well.

Some other changes:
- Improve the comments in the BookmarkNode class.
- Reorganize the member variables of BookmarkNode class to match with the
  getter/setter accessors.
- Reorder some functions in the source file to match with the declaration in the header file.

BUG=None
TEST=None

R=sky@chromium.org

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

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

1 files changed, 11 insertions, 11 deletions

diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index cc20c66..b2a033f 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -29,7 +29,7 @@ using base::Time;
 namespace {
 
 // Helper to get a mutable bookmark node.
-static BookmarkNode* AsMutable(const BookmarkNode* node) {
+BookmarkNode* AsMutable(const BookmarkNode* node) {
   return const_cast<BookmarkNode*>(node);
 }
 
@@ -50,17 +50,9 @@ BookmarkNode::BookmarkNode(int64 id, const GURL& url)
 BookmarkNode::~BookmarkNode() {
 }
 
-void BookmarkNode::Initialize(int64 id) {
-  id_ = id;
-  loaded_favicon_ = false;
-  favicon_load_handle_ = 0;
-  type_ = !url_.is_empty() ? URL : BOOKMARK_BAR;
-  date_added_ = Time::Now();
-}
-
 void BookmarkNode::InvalidateFavicon() {
-  loaded_favicon_ = false;
   favicon_ = SkBitmap();
+  is_favicon_loaded_ = false;
 }
 
 bool BookmarkNode::IsVisible() const {
@@ -74,6 +66,14 @@ bool BookmarkNode::IsVisible() const {
   return false;
 }
 
+void BookmarkNode::Initialize(int64 id) {
+  id_ = id;
+  type_ = url_.is_empty() ? FOLDER : URL;
+  date_added_ = Time::Now();
+  is_favicon_loaded_ = false;
+  favicon_load_handle_ = 0;
+}
+
 // BookmarkModel --------------------------------------------------------------
 
 namespace {
@@ -234,7 +234,7 @@ const SkBitmap& BookmarkModel::GetFavicon(const BookmarkNode* node) {
   DCHECK(node);
   if (!node->is_favicon_loaded()) {
     BookmarkNode* mutable_node = AsMutable(node);
-    mutable_node->set_favicon_loaded(true);
+    mutable_node->set_is_favicon_loaded(true);
     LoadFavicon(mutable_node);
   }
   return node->favicon();