Managed bookmarks for supervised users

components/policy/core/browser/managed_bookmarks_tracker.cc

Index: components/policy/core/browser/managed_bookmarks_tracker.cc
diff --git a/components/policy/core/browser/managed_bookmarks_tracker.cc b/components/policy/core/browser/managed_bookmarks_tracker.cc
index 336ef02ccca9b9de4614ac7ea86e31261e4800c2..5a2105e122d39928bc97f66c6384b40b11c67210 100644
--- a/components/policy/core/browser/managed_bookmarks_tracker.cc
+++ b/components/policy/core/browser/managed_bookmarks_tracker.cc
@@ -30,8 +30,10 @@ const char ManagedBookmarksTracker::kChildren[] = "children";
 ManagedBookmarksTracker::ManagedBookmarksTracker(
     BookmarkModel* model,
     PrefService* prefs,
+    bool is_supervised,
     const GetManagementDomainCallback& callback)
     : model_(model),
+      is_supervised_(is_supervised),
       managed_node_(NULL),
       prefs_(prefs),
       get_management_domain_callback_(callback) {
@@ -41,8 +43,7 @@ ManagedBookmarksTracker::~ManagedBookmarksTracker() {}
 
 scoped_ptr<base::ListValue>
 ManagedBookmarksTracker::GetInitialManagedBookmarks() {
-  const base::ListValue* list =
-      prefs_->GetList(bookmarks::prefs::kManagedBookmarks);
+  const base::ListValue* list = prefs_->GetList(GetPrefName());
   return make_scoped_ptr(list->DeepCopy());
 }
 
@@ -77,30 +78,46 @@ int64 ManagedBookmarksTracker::LoadInitial(BookmarkNode* folder,
 void ManagedBookmarksTracker::Init(BookmarkPermanentNode* managed_node) {
   managed_node_ = managed_node;
   registrar_.Init(prefs_);
-  registrar_.Add(bookmarks::prefs::kManagedBookmarks,
+  registrar_.Add(GetPrefName(),
                  base::Bind(&ManagedBookmarksTracker::ReloadManagedBookmarks,
                             base::Unretained(this)));
   // Reload now just in case something changed since the initial load started.
   ReloadManagedBookmarks();
 }
 
-void ManagedBookmarksTracker::ReloadManagedBookmarks() {
-  // Update the managed bookmarks folder title, in case the user just signed
-  // into or out of a managed account.
-  base::string16 title;
-  std::string domain = get_management_domain_callback_.Run();
-  if (domain.empty()) {
-    title =
-        l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME);
+// static
+const char* ManagedBookmarksTracker::GetPrefName(bool is_supervised) {
+  return is_supervised ? bookmarks::prefs::kSupervisedBookmarks
+                       : bookmarks::prefs::kManagedBookmarks;
+}
+
+const char* ManagedBookmarksTracker::GetPrefName() const {
+  return GetPrefName(is_supervised_);
+}
+
+base::string16 ManagedBookmarksTracker::GetBookmarksFolderTitle() const {
+  if (is_supervised_) {
+    return l10n_util::GetStringUTF16(
+        IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME);
   } else {
-    title = l10n_util::GetStringFUTF16(
-        IDS_BOOKMARK_BAR_MANAGED_FOLDER_DOMAIN_NAME, base::UTF8ToUTF16(domain));
+    std::string domain = get_management_domain_callback_.Run();

[bartfab (slow), 2015/01/26 15:40:13]

Nit: const.

[Marc Treib, 2015/01/26 16:16:47]

Done.

+    if (domain.empty()) {
+      return l10n_util::GetStringUTF16(
+          IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME);
+    } else {
+      return l10n_util::GetStringFUTF16(
+          IDS_BOOKMARK_BAR_MANAGED_FOLDER_DOMAIN_NAME,
+          base::UTF8ToUTF16(domain));
+    }
   }
-  model_->SetTitle(managed_node_, title);
+}
+
+void ManagedBookmarksTracker::ReloadManagedBookmarks() {
+  // In case the user just signed into or out of a managed account.

[bartfab (slow), 2015/01/26 15:40:14]

Nit: s/a managed/the/ ("managed accounts" refers to enterprise accounts but you
are using this class more broadly now)

[Marc Treib, 2015/01/26 16:16:47]

Done.

+  model_->SetTitle(managed_node_, GetBookmarksFolderTitle());
 
   // Recursively update all the managed bookmarks and folders.
-  const base::ListValue* list =
-      prefs_->GetList(bookmarks::prefs::kManagedBookmarks);
+  const base::ListValue* list = prefs_->GetList(GetPrefName());
   UpdateBookmarks(managed_node_, list);
 
   // The managed bookmarks folder isn't visible when that policy isn't present.
@@ -177,8 +194,10 @@ bool ManagedBookmarksTracker::LoadBookmark(const base::ListValue* list,
     NOTREACHED();
     return false;
   }
-  if (!*children)
+  if (!*children) {
     *url = GURL(spec);
+    DCHECK(url->is_valid());

[bartfab (slow), 2015/01/26 15:40:14]

Nit: #include "base/logging.h"

[Marc Treib, 2015/01/26 16:16:47]

Done.

+  }
   return true;
 }