| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 5 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/deferred_sequenced_task_runner.h" | 8 #include "base/deferred_sequenced_task_runner.h" |
| 9 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 // Don't sync this, as otherwise, due to a limitation in sync, it | 85 // Don't sync this, as otherwise, due to a limitation in sync, it |
| 86 // will cause a deadlock (see http://crbug.com/97955). If we truly | 86 // will cause a deadlock (see http://crbug.com/97955). If we truly |
| 87 // want to sync the expanded state of folders, it should be part of | 87 // want to sync the expanded state of folders, it should be part of |
| 88 // bookmark sync itself (i.e., a property of the sync folder nodes). | 88 // bookmark sync itself (i.e., a property of the sync folder nodes). |
| 89 registry->RegisterListPref(bookmarks::prefs::kBookmarkEditorExpandedNodes, | 89 registry->RegisterListPref(bookmarks::prefs::kBookmarkEditorExpandedNodes, |
| 90 new base::ListValue, | 90 new base::ListValue, |
| 91 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 91 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 92 registry->RegisterListPref( | 92 registry->RegisterListPref( |
| 93 bookmarks::prefs::kManagedBookmarks, | 93 bookmarks::prefs::kManagedBookmarks, |
| 94 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 94 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 95 registry->RegisterListPref( |
| 96 bookmarks::prefs::kSupervisedBookmarks, |
| 97 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 95 } | 98 } |
| 96 | 99 |
| 97 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse( | 100 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse( |
| 98 content::BrowserContext* context) const { | 101 content::BrowserContext* context) const { |
| 99 return chrome::GetBrowserContextRedirectedInIncognito(context); | 102 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 100 } | 103 } |
| 101 | 104 |
| 102 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { | 105 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { |
| 103 return true; | 106 return true; |
| 104 } | 107 } |
| OLD | NEW |