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

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

Issue 10825147: Made BookmarkService::GetBookmarks return both urls and title. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: splited into 2 cls Created 8 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
Index: chrome/browser/bookmarks/bookmark_model.cc
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index f1a14c8d6722711b39fd113ee352bf4c68da52b1..661a01e038018c442eb302d85830c81a3045306f 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -400,15 +400,20 @@ bool BookmarkModel::IsBookmarked(const GURL& url) {
return IsBookmarkedNoLock(url);
}
-void BookmarkModel::GetBookmarks(std::vector<GURL>* urls) {
+void BookmarkModel::GetBookmarks(
+ std::vector<BookmarkService::Bookmark>* bookmarks) {
base::AutoLock url_lock(url_lock_);
const GURL* last_url = NULL;
for (NodesOrderedByURLSet::iterator i = nodes_ordered_by_url_set_.begin();
i != nodes_ordered_by_url_set_.end(); ++i) {
const GURL* url = &((*i)->url());
// Only add unique URLs.
- if (!last_url || *url != *last_url)
- urls->push_back(*url);
+ if (!last_url || *url != *last_url) {
+ BookmarkService::Bookmark bookmark;
+ bookmark.url = *url;
+ bookmark.title = (*i)->GetTitle();
+ bookmarks->push_back(bookmark);
+ }
last_url = url;
}
}

Powered by Google App Engine
This is Rietveld 408576698