summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks/bookmark_model.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_model.cc')
-rw-r--r--chrome/browser/bookmarks/bookmark_model.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 1ff426d..09d0b4e 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -365,6 +365,16 @@ const BookmarkNode* BookmarkModel::GetMostRecentlyAddedNodeForURL(
return nodes.front();
}
+bool BookmarkModel::HasBookmarks() {
+ base::AutoLock url_lock(url_lock_);
+ return !nodes_ordered_by_url_set_.empty();
+}
+
+bool BookmarkModel::IsBookmarked(const GURL& url) {
+ base::AutoLock url_lock(url_lock_);
+ return IsBookmarkedNoLock(url);
+}
+
void BookmarkModel::GetBookmarks(std::vector<GURL>* urls) {
base::AutoLock url_lock(url_lock_);
const GURL* last_url = NULL;
@@ -378,14 +388,8 @@ void BookmarkModel::GetBookmarks(std::vector<GURL>* urls) {
}
}
-bool BookmarkModel::HasBookmarks() {
- base::AutoLock url_lock(url_lock_);
- return !nodes_ordered_by_url_set_.empty();
-}
-
-bool BookmarkModel::IsBookmarked(const GURL& url) {
- base::AutoLock url_lock(url_lock_);
- return IsBookmarkedNoLock(url);
+void BookmarkModel::BlockTillLoaded() {
+ loaded_signal_.Wait();
}
const BookmarkNode* BookmarkModel::GetNodeByID(int64 id) {
@@ -690,10 +694,6 @@ BookmarkNode* BookmarkModel::AddNode(BookmarkNode* parent,
return node;
}
-void BookmarkModel::BlockTillLoaded() {
- loaded_signal_.Wait();
-}
-
const BookmarkNode* BookmarkModel::GetNodeByID(const BookmarkNode* node,
int64 id) {
if (node->id() == id)