From 01ce254e82ba78843ac3c2e23bffff7858ccc857 Mon Sep 17 00:00:00 2001
From: ianwen <ianwen@chromium.org>
Date: Fri, 7 Nov 2014 15:19:19 -0800
Subject: [PATCH] Exclude partner/managed bookmarks from all items

Changed logics of GetAllBookmarkIdsOrderedByCreationDate in bookmark
bridge to let non-editable bookmarks not shown in all-items.

BUG=415807

Review URL: https://codereview.chromium.org/707293002

Cr-Commit-Position: refs/heads/master@{#303321}
---
 .../android/java/src/org/chromium/chrome/browser/BookmarksBridge.java | 3 ++-
 chrome/browser/android/bookmarks/bookmarks_bridge.cc                  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
index f3f149397e0f..962507d6e12c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
@@ -363,7 +363,8 @@ public class BookmarksBridge {
     }
 
     /**
-     * @return All bookmark IDs ordered by descending creation date.
+     * @return All bookmark IDs ordered by descending creation date. Partner/managed bookmarks are
+     *         not included.
      */
     public List<BookmarkId> getAllBookmarkIDsOrderedByCreationDate() {
         assert mIsNativeBookmarkModelLoaded;
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index 3ca45ba0cbe2..3b61a340c6ed 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()) {
-- 
2.11.4.GIT