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

Unified Diff: components/policy/core/browser/managed_bookmarks_tracker.cc

Issue 490123003: Move bookmark_pref_names.* into bookmarks namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 6 years, 4 months 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
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 0d6246a4389a31ed754412604765e44d72258c02..42ebc76d7e21c604b9fdcd8a0187c9f9db1215de 100644
--- a/components/policy/core/browser/managed_bookmarks_tracker.cc
+++ b/components/policy/core/browser/managed_bookmarks_tracker.cc
@@ -39,7 +39,8 @@ ManagedBookmarksTracker::~ManagedBookmarksTracker() {}
scoped_ptr<base::ListValue>
ManagedBookmarksTracker::GetInitialManagedBookmarks() {
- const base::ListValue* list = prefs_->GetList(prefs::kManagedBookmarks);
+ const base::ListValue* list =
+ prefs_->GetList(bookmarks::prefs::kManagedBookmarks);
return make_scoped_ptr(list->DeepCopy());
}
@@ -74,7 +75,7 @@ int64 ManagedBookmarksTracker::LoadInitial(BookmarkNode* folder,
void ManagedBookmarksTracker::Init(BookmarkPermanentNode* managed_node) {
managed_node_ = managed_node;
registrar_.Init(prefs_);
- registrar_.Add(prefs::kManagedBookmarks,
+ registrar_.Add(bookmarks::prefs::kManagedBookmarks,
base::Bind(&ManagedBookmarksTracker::ReloadManagedBookmarks,
base::Unretained(this)));
// Reload now just in case something changed since the initial load started.
@@ -96,7 +97,8 @@ void ManagedBookmarksTracker::ReloadManagedBookmarks() {
model_->SetTitle(managed_node_, title);
// Recursively update all the managed bookmarks and folders.
- const base::ListValue* list = prefs_->GetList(prefs::kManagedBookmarks);
+ const base::ListValue* list =
+ prefs_->GetList(bookmarks::prefs::kManagedBookmarks);
UpdateBookmarks(managed_node_, list);
// The managed bookmarks folder isn't visible when that policy isn't present.

Powered by Google App Engine
This is Rietveld 408576698