| 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 efa8779fb48cf4585c17816b1a094824e82d94c2..40345792001818922ce70a45b842cdc153cdd9d7 100644
|
| --- a/chrome/browser/bookmarks/bookmark_model_factory.cc
|
| +++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
|
| @@ -40,13 +40,13 @@ ProfileKeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
|
| return bookmark_model;
|
| }
|
|
|
| -void BookmarkModelFactory::RegisterUserPrefs(PrefService* prefs) {
|
| +void BookmarkModelFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| // 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).
|
| prefs->RegisterListPref(prefs::kBookmarkEditorExpandedNodes, new ListValue,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| bool BookmarkModelFactory::ServiceRedirectedInIncognito() const {
|
|
|