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

Side by Side Diff: chrome/browser/background/background_contents_service_factory.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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/background/background_contents_service_factory.h" 5 #include "chrome/browser/background/background_contents_service_factory.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/background/background_contents_service.h" 8 #include "chrome/browser/background/background_contents_service.h"
9 #include "chrome/browser/prefs/pref_registry_syncable.h"
9 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/profiles/profile_dependency_manager.h" 12 #include "chrome/browser/profiles/profile_dependency_manager.h"
12 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
13 14
14 // static 15 // static
15 BackgroundContentsService* BackgroundContentsServiceFactory::GetForProfile( 16 BackgroundContentsService* BackgroundContentsServiceFactory::GetForProfile(
16 Profile* profile) { 17 Profile* profile) {
17 return static_cast<BackgroundContentsService*>( 18 return static_cast<BackgroundContentsService*>(
18 GetInstance()->GetServiceForProfile(profile, true)); 19 GetInstance()->GetServiceForProfile(profile, true));
(...skipping 13 matching lines...) Expand all
32 BackgroundContentsServiceFactory::~BackgroundContentsServiceFactory() { 33 BackgroundContentsServiceFactory::~BackgroundContentsServiceFactory() {
33 } 34 }
34 35
35 ProfileKeyedService* BackgroundContentsServiceFactory::BuildServiceInstanceFor( 36 ProfileKeyedService* BackgroundContentsServiceFactory::BuildServiceInstanceFor(
36 Profile* profile) const { 37 Profile* profile) const {
37 return new BackgroundContentsService(profile, 38 return new BackgroundContentsService(profile,
38 CommandLine::ForCurrentProcess()); 39 CommandLine::ForCurrentProcess());
39 } 40 }
40 41
41 void BackgroundContentsServiceFactory::RegisterUserPrefs( 42 void BackgroundContentsServiceFactory::RegisterUserPrefs(
42 PrefServiceSyncable* user_prefs) { 43 PrefRegistrySyncable* user_prefs) {
43 user_prefs->RegisterDictionaryPref(prefs::kRegisteredBackgroundContents, 44 user_prefs->RegisterDictionaryPref(prefs::kRegisteredBackgroundContents,
44 PrefServiceSyncable::UNSYNCABLE_PREF); 45 PrefRegistrySyncable::UNSYNCABLE_PREF);
45 } 46 }
46 47
47 bool 48 bool
48 BackgroundContentsServiceFactory::ServiceHasOwnInstanceInIncognito() const { 49 BackgroundContentsServiceFactory::ServiceHasOwnInstanceInIncognito() const {
49 return true; 50 return true;
50 } 51 }
51 52
52 bool BackgroundContentsServiceFactory::ServiceIsCreatedWithProfile() const { 53 bool BackgroundContentsServiceFactory::ServiceIsCreatedWithProfile() const {
53 return true; 54 return true;
54 } 55 }
55 56
56 bool BackgroundContentsServiceFactory::ServiceIsNULLWhileTesting() const { 57 bool BackgroundContentsServiceFactory::ServiceIsNULLWhileTesting() const {
57 return true; 58 return true;
58 } 59 }
OLDNEW
« no previous file with comments | « chrome/browser/background/background_contents_service_factory.h ('k') | chrome/browser/bookmarks/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698