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

chrome/browser/bookmarks/bookmark_model.cc

Index: chrome/browser/bookmarks/bookmark_model.cc
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index cc20c66a72fbe74095e537fe09a34b9ceafa7b73..c94cd7a31be0cfec7babfa609285b2d97feb8498 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() ? URL : BOOKMARK_BAR;

[tfarina, 2011/07/07 17:03:29]

So, instead of BOOKMARK_BAR shouldn't this be FOLDER?

[sky, 2011/07/07 22:26:36]

Yes, I believe everyone sets the type, so that should be fine.

[tfarina, 2011/07/07 23:08:59]

Done.

+  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);

[tfarina, 2011/07/07 17:03:29]

Should we remove the friend relationship with BookmarkModel from BookmarkNode?
It seems we aren't using it at all. Otherwise, this would have to be
mutable_node->is_favicon_loaded_ = true;

[sky, 2011/07/07 22:26:36]

If the friend is not needed it, remove it.

     LoadFavicon(mutable_node);
   }
   return node->favicon();