summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/bookmarks/bookmark_model.cc3
-rw-r--r--chrome/browser/bookmarks/bookmark_model.h9
2 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index e0ccaaf86..e55e552 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -196,7 +196,6 @@ bool BookmarkPermanentNode::IsVisible() const {
BookmarkModel::BookmarkModel(Profile* profile)
: profile_(profile),
loaded_(false),
- file_changed_(false),
root_(GURL()),
bookmark_bar_node_(NULL),
other_node_(NULL),
@@ -710,8 +709,6 @@ void BookmarkModel::DoneLoading(BookmarkLoadDetails* details_delete_me) {
}
next_node_id_ = details->max_id();
- if (details->computed_checksum() != details->stored_checksum())
- file_changed_ = true;
if (details->computed_checksum() != details->stored_checksum() ||
details->ids_reassigned()) {
// If bookmarks file changed externally, the IDs may have changed
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 548189a..91d960e 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -368,9 +368,6 @@ class BookmarkModel : public content::NotificationObserver,
// testing.
void ClearStore();
- // Returns whether the bookmarks file changed externally.
- bool file_changed() const { return file_changed_; }
-
// Returns the next node ID.
int64 next_node_id() const { return next_node_id_; }
@@ -413,7 +410,7 @@ class BookmarkModel : public content::NotificationObserver,
// This does NOT delete the node.
void RemoveNode(BookmarkNode* node, std::set<GURL>* removed_urls);
- // Invoked when loading is finished. Sets loaded_ and notifies observers.
+ // Invoked when loading is finished. Sets |loaded_| and notifies observers.
// BookmarkModel takes ownership of |details|.
void DoneLoading(BookmarkLoadDetails* details);
@@ -482,10 +479,6 @@ class BookmarkModel : public content::NotificationObserver,
// Whether the initial set of data has been loaded.
bool loaded_;
- // Whether the bookmarks file was changed externally. This is set after
- // loading is complete and once set the value never changes.
- bool file_changed_;
-
// The root node. This contains the bookmark bar node and the 'other' node as
// children.
BookmarkNode root_;