OLD | NEW |
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/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/profiles/profile_dependency_manager.h" | 9 #include "chrome/browser/profiles/profile_dependency_manager.h" |
9 #include "chrome/browser/search/instant_service.h" | 10 #include "chrome/browser/search/instant_service.h" |
10 | 11 |
11 // static | 12 // static |
12 InstantService* InstantServiceFactory::GetForProfile(Profile* profile) { | 13 InstantService* InstantServiceFactory::GetForProfile(Profile* profile) { |
13 return static_cast<InstantService*>( | 14 return static_cast<InstantService*>( |
14 GetInstance()->GetServiceForProfile(profile, true)); | 15 GetInstance()->GetServiceForProfile(profile, true)); |
15 } | 16 } |
16 | 17 |
17 // static | 18 // static |
18 InstantServiceFactory* InstantServiceFactory::GetInstance() { | 19 InstantServiceFactory* InstantServiceFactory::GetInstance() { |
19 return Singleton<InstantServiceFactory>::get(); | 20 return Singleton<InstantServiceFactory>::get(); |
20 } | 21 } |
21 | 22 |
22 InstantServiceFactory::InstantServiceFactory() | 23 InstantServiceFactory::InstantServiceFactory() |
23 : ProfileKeyedServiceFactory("InstantService", | 24 : ProfileKeyedServiceFactory("InstantService", |
24 ProfileDependencyManager::GetInstance()) { | 25 ProfileDependencyManager::GetInstance()) { |
25 // No dependencies. | 26 // No dependencies. |
26 } | 27 } |
27 | 28 |
28 InstantServiceFactory::~InstantServiceFactory() { | 29 InstantServiceFactory::~InstantServiceFactory() { |
29 } | 30 } |
30 | 31 |
31 bool InstantServiceFactory::ServiceHasOwnInstanceInIncognito() const { | 32 content::BrowserContext* InstantServiceFactory::GetBrowserContextToUse( |
32 return true; | 33 content::BrowserContext* context) const { |
| 34 return chrome::GetBrowserContextOwnInstanceInIncognito(context); |
33 } | 35 } |
34 | 36 |
35 ProfileKeyedService* InstantServiceFactory::BuildServiceInstanceFor( | 37 ProfileKeyedService* InstantServiceFactory::BuildServiceInstanceFor( |
36 content::BrowserContext* profile) const { | 38 content::BrowserContext* profile) const { |
37 return new InstantService(static_cast<Profile*>(profile)); | 39 return new InstantService(static_cast<Profile*>(profile)); |
38 } | 40 } |
OLD | NEW |