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

Unified Diff: chrome/browser/bookmarks/bookmark_model_factory.cc

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 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
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model_factory.h ('k') | chrome/browser/bookmarks/bookmark_prompt_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_model_factory.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc
index 9632e3f0cb2879156ee5c2659ff544af0ac1c3ab..bef791de73ed1e2bc91958744073680c0d1c6cd9 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -48,14 +48,15 @@ ProfileKeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
return bookmark_model;
}
-void BookmarkModelFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+void BookmarkModelFactory::RegisterUserPrefs(
+ user_prefs::PrefRegistrySyncable* registry) {
// Don't sync this, as otherwise, due to a limitation in sync, it
// will cause a deadlock (see http://crbug.com/97955). If we truly
// want to sync the expanded state of folders, it should be part of
// bookmark sync itself (i.e., a property of the sync folder nodes).
registry->RegisterListPref(prefs::kBookmarkEditorExpandedNodes,
new base::ListValue,
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
}
content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse(
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model_factory.h ('k') | chrome/browser/bookmarks/bookmark_prompt_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698