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

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

Issue 10908088: Cleanup: Constify some ProfileKeyedBaseFactory methods and all overrides. Remove ProfileKeyedBaseFa… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase, remove a few more lines of code Created 8 years, 3 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 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/history/history_service_factory.h" 9 #include "chrome/browser/history/history_service_factory.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 void BookmarkModelFactory::RegisterUserPrefs(PrefService* prefs) { 44 void BookmarkModelFactory::RegisterUserPrefs(PrefService* prefs) {
45 // Don't sync this, as otherwise, due to a limitation in sync, it 45 // Don't sync this, as otherwise, due to a limitation in sync, it
46 // will cause a deadlock (see http://crbug.com/97955). If we truly 46 // will cause a deadlock (see http://crbug.com/97955). If we truly
47 // want to sync the expanded state of folders, it should be part of 47 // want to sync the expanded state of folders, it should be part of
48 // bookmark sync itself (i.e., a property of the sync folder nodes). 48 // bookmark sync itself (i.e., a property of the sync folder nodes).
49 prefs->RegisterListPref(prefs::kBookmarkEditorExpandedNodes, new ListValue, 49 prefs->RegisterListPref(prefs::kBookmarkEditorExpandedNodes, new ListValue,
50 PrefService::UNSYNCABLE_PREF); 50 PrefService::UNSYNCABLE_PREF);
51 } 51 }
52 52
53 bool BookmarkModelFactory::ServiceRedirectedInIncognito() { 53 bool BookmarkModelFactory::ServiceRedirectedInIncognito() const {
54 return true; 54 return true;
55 } 55 }
56 56
57 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() { 57 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {
58 return true; 58 return true;
59 } 59 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model_factory.h ('k') | chrome/browser/captive_portal/captive_portal_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698