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

chrome/browser/bookmarks/bookmark_model.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/callback.h"
@@ skipping 11 matching lines @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "ui/gfx/codec/png_codec.h"
 
 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);
 }
 
 }  // namespace
 
 // BookmarkNode ---------------------------------------------------------------
 
 BookmarkNode::BookmarkNode(const GURL& url)
     : url_(url) {
   Initialize(0);
 }
 
 BookmarkNode::BookmarkNode(int64 id, const GURL& url)
     : url_(url) {
   Initialize(id);
 }
 
 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 {
   // The synced bookmark folder is invisible if the flag isn't set and there are
   // no bookmarks under it.
   if (type_ != BookmarkNode::SYNCED ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableSyncedBookmarksFolder) || !empty()) {
     return true;
   }
   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 {
 
 // Comparator used when sorting bookmarks. Folders are sorted first, then
 // bookmarks.
 class SortComparator : public std::binary_function<const BookmarkNode*,
                                                    const BookmarkNode*,
                                                    bool> {
  public:
@@ skipping 140 matching lines @@
   bookmark_utils::CloneBookmarkNode(this, elements, new_parent, index);
 
   if (store_.get())
     store_->ScheduleSave();
 }
 
 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();
 }
 
 void BookmarkModel::SetTitle(const BookmarkNode* node, const string16& title) {
   if (!node) {
     NOTREACHED();
     return;
   }
@@ skipping 557 matching lines @@
   file_changed_ = true;
 }
 
 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() {
   BookmarkNode* bb_node = CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
   BookmarkNode* other_node = CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkNode* synced_node = CreatePermanentNode(BookmarkNode::SYNCED);
   return new BookmarkLoadDetails(bb_node, other_node, synced_node,
                                  new BookmarkIndex(profile()), next_node_id_);
 }