Managed bookmarks for supervised users

chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
 
 #include <math.h>  // For floor()
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 58 matching lines @@
     }
   }
 
   bookmark_tree_node->title = base::UTF16ToUTF8(node->GetTitle());
   if (!node->date_added().is_null()) {
     // Javascript Date wants milliseconds since the epoch, ToDoubleT is seconds.
     bookmark_tree_node->date_added.reset(
         new double(floor(node->date_added().ToDoubleT() * 1000)));
   }
 
-  if (client->IsDescendantOfManagedNode(node))
+  if (bookmarks::IsDescendantOf(node, client->managed_node()) ||
+      bookmarks::IsDescendantOf(node, client->supervised_node())) {
     bookmark_tree_node->unmodifiable = BookmarkTreeNode::UNMODIFIABLE_MANAGED;
+  }
 
   if (recurse && node->is_folder()) {
     std::vector<linked_ptr<BookmarkTreeNode> > children;
     for (int i = 0; i < node->child_count(); ++i) {
       const BookmarkNode* child = node->GetChild(i);
       if (child->IsVisible() && (!only_folders || child->is_folder())) {
         linked_ptr<BookmarkTreeNode> child_node(
             GetBookmarkTreeNode(client, child, true, only_folders));
         children.push_back(child_node);
       }
@@ skipping 25 matching lines @@
                 std::string* error) {
   const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, id);
   if (!node) {
     *error = keys::kNoNodeError;
     return false;
   }
   if (model->is_permanent_node(node)) {
     *error = keys::kModifySpecialError;
     return false;
   }
-  if (client->IsDescendantOfManagedNode(node)) {
+  if (bookmarks::IsDescendantOf(node, client->managed_node()) ||
+      bookmarks::IsDescendantOf(node, client->supervised_node())) {
     *error = keys::kModifyManagedError;
     return false;
   }
   if (node->is_folder() && !node->empty() && !recursive) {
     *error = keys::kFolderNotEmptyError;
     return false;
   }
 
   const BookmarkNode* parent = node->parent();
   model->Remove(parent, parent->GetIndexOf(node));
@@ skipping 17 matching lines @@
 
   if (node.is_folder()) {
     for (int i = 0; i < node.child_count(); ++i) {
       GetMetaInfo(*(node.GetChild(i)), id_to_meta_info_map);
     }
   }
 }
 
 }  // namespace bookmark_api_helpers
 }  // namespace extensions