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

Side by Side Diff: chrome/browser/bookmarks/bookmark_model_factory.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile_dependency_manager.h" 10 #include "chrome/browser/profiles/profile_dependency_manager.h"
(...skipping 22 matching lines...) Expand all
33 33
34 BookmarkModelFactory::~BookmarkModelFactory() {} 34 BookmarkModelFactory::~BookmarkModelFactory() {}
35 35
36 ProfileKeyedService* BookmarkModelFactory::BuildServiceInstanceFor( 36 ProfileKeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
37 Profile* profile) const { 37 Profile* profile) const {
38 BookmarkModel* bookmark_model = new BookmarkModel(profile); 38 BookmarkModel* bookmark_model = new BookmarkModel(profile);
39 bookmark_model->Load(); 39 bookmark_model->Load();
40 return bookmark_model; 40 return bookmark_model;
41 } 41 }
42 42
43 void BookmarkModelFactory::RegisterUserPrefs(PrefService* prefs) { 43 void BookmarkModelFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
44 // Don't sync this, as otherwise, due to a limitation in sync, it 44 // Don't sync this, as otherwise, due to a limitation in sync, it
45 // will cause a deadlock (see http://crbug.com/97955). If we truly 45 // will cause a deadlock (see http://crbug.com/97955). If we truly
46 // want to sync the expanded state of folders, it should be part of 46 // want to sync the expanded state of folders, it should be part of
47 // bookmark sync itself (i.e., a property of the sync folder nodes). 47 // bookmark sync itself (i.e., a property of the sync folder nodes).
48 prefs->RegisterListPref(prefs::kBookmarkEditorExpandedNodes, new ListValue, 48 prefs->RegisterListPref(prefs::kBookmarkEditorExpandedNodes, new ListValue,
49 PrefService::UNSYNCABLE_PREF); 49 PrefServiceSyncable::UNSYNCABLE_PREF);
50 } 50 }
51 51
52 bool BookmarkModelFactory::ServiceRedirectedInIncognito() const { 52 bool BookmarkModelFactory::ServiceRedirectedInIncognito() const {
53 return true; 53 return true;
54 } 54 }
55 55
56 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { 56 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {
57 return true; 57 return true;
58 } 58 }
OLDNEW
« 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