Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4521)

Unified Diff: chrome/browser/bookmarks/bookmark_model.cc

Issue 7318001: bookmarks: Rename |loaded_favicon_| to |is_favicon_loaded_| so it matches with the getter accessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: BOOKMARK_BAR -> FOLDER Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..b2a033f1d115c69ade4f547e58ba6b537bf34e67 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();
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698