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

Side by Side Diff: chrome/browser/search/instant_service_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/search/instant_service_factory.h" 5 #include "chrome/browser/search/instant_service_factory.h"
6 6
7 #include "chrome/browser/profiles/incognito_helpers.h" 7 #include "chrome/browser/profiles/incognito_helpers.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/search/instant_service.h" 9 #include "chrome/browser/search/instant_service.h"
10 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 10 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
11 11
12 // static 12 // static
13 InstantService* InstantServiceFactory::GetForProfile(Profile* profile) { 13 InstantService* InstantServiceFactory::GetForProfile(Profile* profile) {
14 return static_cast<InstantService*>( 14 return static_cast<InstantService*>(
15 GetInstance()->GetServiceForProfile(profile, true)); 15 GetInstance()->GetServiceForBrowserContext(profile, true));
16 } 16 }
17 17
18 // static 18 // static
19 InstantServiceFactory* InstantServiceFactory::GetInstance() { 19 InstantServiceFactory* InstantServiceFactory::GetInstance() {
20 return Singleton<InstantServiceFactory>::get(); 20 return Singleton<InstantServiceFactory>::get();
21 } 21 }
22 22
23 InstantServiceFactory::InstantServiceFactory() 23 InstantServiceFactory::InstantServiceFactory()
24 : ProfileKeyedServiceFactory("InstantService", 24 : BrowserContextKeyedServiceFactory(
25 ProfileDependencyManager::GetInstance()) { 25 "InstantService",
26 BrowserContextDependencyManager::GetInstance()) {
26 // No dependencies. 27 // No dependencies.
27 } 28 }
28 29
29 InstantServiceFactory::~InstantServiceFactory() { 30 InstantServiceFactory::~InstantServiceFactory() {
30 } 31 }
31 32
32 content::BrowserContext* InstantServiceFactory::GetBrowserContextToUse( 33 content::BrowserContext* InstantServiceFactory::GetBrowserContextToUse(
33 content::BrowserContext* context) const { 34 content::BrowserContext* context) const {
34 return chrome::GetBrowserContextOwnInstanceInIncognito(context); 35 return chrome::GetBrowserContextOwnInstanceInIncognito(context);
35 } 36 }
36 37
37 ProfileKeyedService* InstantServiceFactory::BuildServiceInstanceFor( 38 BrowserContextKeyedService* InstantServiceFactory::BuildServiceInstanceFor(
38 content::BrowserContext* profile) const { 39 content::BrowserContext* profile) const {
39 return new InstantService(static_cast<Profile*>(profile)); 40 return new InstantService(static_cast<Profile*>(profile));
40 } 41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698