From cf8e817e64b3d5a730bb1d706adb801b2d2b5ef8 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Sat, 23 Jul 2011 00:46:24 +0000 Subject: bookmarks: Add missing OVERRIDE annotations to virtual method implementations. While I'm here reorder the methods in both header and source file to make it easier to find them. BUG=None TEST=None R=sky@chromium.org Review URL: http://codereview.chromium.org/7461034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93745 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/bookmarks/bookmark_model.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'chrome/browser/bookmarks/bookmark_model.cc') 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* urls) { base::AutoLock url_lock(url_lock_); const GURL* last_url = NULL; @@ -378,14 +388,8 @@ void BookmarkModel::GetBookmarks(std::vector* 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) -- cgit v1.1