Managed bookmarks for supervised users

chrome/browser/bookmarks/chrome_bookmark_client.h

Index: chrome/browser/bookmarks/chrome_bookmark_client.h
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.h b/chrome/browser/bookmarks/chrome_bookmark_client.h
index eec66984695b87decd7958dfca316b479bf7f77b..17fa5895b96136307d1ba6bf6b264c3c5eb911e6 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.h
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.h
@@ -34,14 +34,29 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient,
 
   // Returns the managed_node.
   const BookmarkNode* managed_node() { return managed_node_; }
+  // Returns the supervised_node.

[Pam (message me for reviews), 2015/01/14 14:03:37]

This comment (and the managed_node() one above) is really pointless.

[Marc Treib, 2015/01/14 16:40:50]

I guess somebody wanted every public method to have a comment. But agreed; I've
removed the comments.

+  const BookmarkNode* supervised_node() { return supervised_node_; }
 
   // Returns true if the given node belongs to the managed bookmarks tree.
   bool IsDescendantOfManagedNode(const BookmarkNode* node);
-
   // Returns true if there is at least one managed node in the |list|.
   bool HasDescendantsOfManagedNode(
       const std::vector<const BookmarkNode*>& list);
 
+  // Returns true if the given node belongs to the supervised bookmarks tree.
+  bool IsDescendantOfSupervisedNode(const BookmarkNode* node);
+  // Returns true if there is at least one supervised node in the |list|.
+  bool HasDescendantsOfSupervisedNode(
+      const std::vector<const BookmarkNode*>& list);
+
+  // Returns true if the given node belongs to either the managed or the
+  // supervised bookmarks tree.
+  bool IsDescendantOfManagedOrSupervisedNode(const BookmarkNode* node);
+  // Returns true if there is at least one managed or supervised node in the
+  // |list|.
+  bool HasDescendantsOfManagedOrSupervisedNode(
+      const std::vector<const BookmarkNode*>& list);
+
   // bookmarks::BookmarkClient:
   bool PreferTouchIcon() override;
   base::CancelableTaskTracker::TaskId GetFaviconImageForPageURL(
@@ -79,6 +94,8 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient,
   static bookmarks::BookmarkPermanentNodeList LoadExtraNodes(
       scoped_ptr<BookmarkPermanentNode> managed_node,
       scoped_ptr<base::ListValue> initial_managed_bookmarks,
+      scoped_ptr<BookmarkPermanentNode> supervised_node,
+      scoped_ptr<base::ListValue> initial_supervised_bookmarks,
       int64* next_node_id);
 
   // Returns the management domain that configured the managed bookmarks,
@@ -102,6 +119,9 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient,
   scoped_ptr<policy::ManagedBookmarksTracker> managed_bookmarks_tracker_;
   BookmarkPermanentNode* managed_node_;

[Pam (message me for reviews), 2015/01/14 14:03:37]

Somewhere in this file, maybe as comments for managed_node_ and
supervised_node_, it needs a better description of the difference between
"managed" and "supervised" bookmarks.

[Marc Treib, 2015/01/14 16:40:50]

Done.

 
+  scoped_ptr<policy::ManagedBookmarksTracker> supervised_bookmarks_tracker_;
+  BookmarkPermanentNode* supervised_node_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient);
 };