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

Unified Diff: chrome/browser/android/bookmarks/bookmarks_bridge.cc

Issue 669623008: Remove visible for testing notation for getMobileFolder() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/bookmarks/bookmarks_bridge.cc
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index 3ca45ba0cbe297a77e64a05773b4d01394dda4d3..3b61a340c6ed516bb3a2e768a988192f4371af95 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -449,7 +449,6 @@ void BookmarksBridge::GetAllBookmarkIDsOrderedByCreationDate(
std::list<const BookmarkNode*> folders;
std::vector<const BookmarkNode*> result;
folders.push_back(bookmark_model_->root_node());
- folders.push_back(partner_bookmarks_shim_->GetPartnerBookmarksRoot());
for (std::list<const BookmarkNode*>::iterator folder_iter = folders.begin();
folder_iter != folders.end(); ++folder_iter) {
@@ -461,7 +460,8 @@ void BookmarksBridge::GetAllBookmarkIDsOrderedByCreationDate(
for (int i = 0; i < (*folder_iter)->child_count(); ++i) {
const BookmarkNode* child = (*folder_iter)->GetChild(i);
- if (!IsFolderAvailable(child) || !IsReachable(child))
+ if (!IsFolderAvailable(child) || !IsReachable(child) ||
+ client_->IsDescendantOfManagedNode(child))
continue;
if (child->is_folder()) {
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698