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

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

Issue 7012005: Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux test failure Created 9 years, 7 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_utils.cc
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 22a2d21451ca348ee6bc130dee198b53fcdd0390..aed5d4bac9b256b11436a73b67e4c8599e35ee1b 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -479,6 +479,17 @@ std::vector<const BookmarkNode*> GetMostRecentlyModifiedFolders(
if (nodes.size() < max_count &&
find(nodes.begin(), nodes.end(), model->other_node()) == nodes.end()) {
nodes.push_back(model->other_node());
+
+ if (nodes.size() < max_count &&
+ find(nodes.begin(), nodes.end(),
+ model->synced_node()) == nodes.end()) {
+ nodes.push_back(model->synced_node());
+ if (nodes.size() < max_count &&
sky 2011/05/17 15:59:08 I don't think you want this inner if, do you? Also
Yaron 2011/05/17 19:17:33 Woah. Not sure what happened there. Fixed. And ya,
+ std::find(nodes.begin(), nodes.end(),
+ model->synced_node()) == nodes.end()) {
+ nodes.push_back(model->synced_node());
+ }
+ }
}
}
return nodes;

Powered by Google App Engine
This is Rietveld 408576698