Changes BookmarkModel to not grab the same lock twice.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6391

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3127 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 1 deletions

diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index a9f6308..7c2a6ba 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -202,7 +202,8 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
   // modified groups. This never returns an empty vector.
   std::vector<BookmarkNode*> GetMostRecentlyModifiedGroups(size_t max_count);
 
-  // Returns the most recently added bookmarks.
+  // Returns the most recently added bookmarks. This does not return groups,
+  // only nodes of type url.
   void GetMostRecentlyAddedEntries(size_t count,
                                    std::vector<BookmarkNode*>* nodes);
 
@@ -294,6 +295,8 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
   // combobox of most recently modified groups.
   void ResetDateGroupModified(BookmarkNode* node);
 
+  Profile* profile() const { return profile_; }
+
  private:
   // Used to order BookmarkNodes by URL.
   class NodeURLComparator {
@@ -303,6 +306,10 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
     }
   };
 
+  // Implementation of IsBookmarked. Before calling this the caller must
+  // obtain a lock on url_lock_.
+  bool IsBookmarkedNoLock(const GURL& url);
+
   // Overriden to notify the observer the favicon has been loaded.
   void FavIconLoaded(BookmarkNode* node);