| Index: chrome/browser/bookmarks/bookmark_utils.cc
|
| diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
|
| index 329654e340d25d36c5b2006b4d64b2295b52e5e9..6d63505d99e4928b9c58f864690164b0a2942c02 100644
|
| --- a/chrome/browser/bookmarks/bookmark_utils.cc
|
| +++ b/chrome/browser/bookmarks/bookmark_utils.cc
|
| @@ -18,7 +18,8 @@
|
| #include "chrome/browser/bookmarks/bookmark_model_factory.h"
|
| #include "chrome/browser/bookmarks/bookmark_node_data.h"
|
| #include "chrome/browser/history/query_parser.h"
|
| -#include "chrome/browser/prefs/pref_service_syncable.h"
|
| +#include "chrome/browser/prefs/pref_registry_syncable.h"
|
| +#include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "content/public/browser/user_metrics.h"
|
| @@ -431,13 +432,13 @@ const BookmarkNode* ApplyEditsWithPossibleFolderChange(
|
| return node;
|
| }
|
|
|
| -void RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| - prefs->RegisterBooleanPref(prefs::kShowBookmarkBar,
|
| - false,
|
| - PrefServiceSyncable::SYNCABLE_PREF);
|
| - prefs->RegisterBooleanPref(prefs::kEditBookmarksEnabled,
|
| - true,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| +void RegisterUserPrefs(PrefRegistrySyncable* registry) {
|
| + registry->RegisterBooleanPref(prefs::kShowBookmarkBar,
|
| + false,
|
| + PrefRegistrySyncable::SYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled,
|
| + true,
|
| + PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| const BookmarkNode* GetParentForNewNodes(
|
|
|