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

Side by Side Diff: chrome/browser/autofill/autocheckout_whitelist_manager_factory.cc

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/autofill/autocheckout_whitelist_manager_factory.h" 5 #include "chrome/browser/autofill/autocheckout_whitelist_manager_factory.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "chrome/browser/profiles/incognito_helpers.h" 9 #include "chrome/browser/profiles/incognito_helpers.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 WhitelistManager* 44 WhitelistManager*
45 WhitelistManagerServiceImpl::GetWhitelistManager() { 45 WhitelistManagerServiceImpl::GetWhitelistManager() {
46 return whitelist_manager_.get(); 46 return whitelist_manager_.get();
47 } 47 }
48 48
49 // static 49 // static
50 WhitelistManager* 50 WhitelistManager*
51 WhitelistManagerFactory::GetForProfile(Profile* profile) { 51 WhitelistManagerFactory::GetForProfile(Profile* profile) {
52 WhitelistManagerService* service = 52 WhitelistManagerService* service =
53 static_cast<WhitelistManagerService*>( 53 static_cast<WhitelistManagerService*>(
54 GetInstance()->GetServiceForProfile(profile, true)); 54 GetInstance()->GetServiceForBrowserContext(profile, true));
55 // service can be NULL for tests. 55 // service can be NULL for tests.
56 return service ? service->GetWhitelistManager() : NULL; 56 return service ? service->GetWhitelistManager() : NULL;
57 } 57 }
58 58
59 // static 59 // static
60 WhitelistManagerFactory* 60 WhitelistManagerFactory*
61 WhitelistManagerFactory::GetInstance() { 61 WhitelistManagerFactory::GetInstance() {
62 return Singleton<WhitelistManagerFactory>::get(); 62 return Singleton<WhitelistManagerFactory>::get();
63 } 63 }
64 64
65 WhitelistManagerFactory::WhitelistManagerFactory() 65 WhitelistManagerFactory::WhitelistManagerFactory()
66 : ProfileKeyedServiceFactory("AutocheckoutWhitelistManager", 66 : BrowserContextKeyedServiceFactory(
67 ProfileDependencyManager::GetInstance()) { 67 "AutocheckoutWhitelistManager",
68 BrowserContextDependencyManager::GetInstance()) {
68 } 69 }
69 70
70 WhitelistManagerFactory::~WhitelistManagerFactory() { 71 WhitelistManagerFactory::~WhitelistManagerFactory() {
71 } 72 }
72 73
73 ProfileKeyedService* 74 BrowserContextKeyedService*
74 WhitelistManagerFactory::BuildServiceInstanceFor( 75 WhitelistManagerFactory::BuildServiceInstanceFor(
75 content::BrowserContext* profile) const { 76 content::BrowserContext* profile) const {
76 WhitelistManagerService* service = 77 WhitelistManagerService* service =
77 new WhitelistManagerServiceImpl(static_cast<Profile*>(profile)); 78 new WhitelistManagerServiceImpl(static_cast<Profile*>(profile));
78 return service; 79 return service;
79 } 80 }
80 81
81 content::BrowserContext* WhitelistManagerFactory::GetBrowserContextToUse( 82 content::BrowserContext* WhitelistManagerFactory::GetBrowserContextToUse(
82 content::BrowserContext* context) const { 83 content::BrowserContext* context) const {
83 return chrome::GetBrowserContextRedirectedInIncognito(context); 84 return chrome::GetBrowserContextRedirectedInIncognito(context);
84 } 85 }
85 86
86 bool WhitelistManagerFactory::ServiceIsNULLWhileTesting() const { 87 bool WhitelistManagerFactory::ServiceIsNULLWhileTesting() const {
87 return true; 88 return true;
88 } 89 }
89 90
90 } // namespace autocheckout 91 } // namespace autocheckout
91 } // namespace autofill 92 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698