OLD | NEW |
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/predictors/autocomplete_action_predictor_factory.h" | 5 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" |
6 | 6 |
7 #include "chrome/browser/history/history_service_factory.h" | 7 #include "chrome/browser/history/history_service_factory.h" |
8 #include "chrome/browser/predictors/autocomplete_action_predictor.h" | 8 #include "chrome/browser/predictors/autocomplete_action_predictor.h" |
9 #include "chrome/browser/predictors/predictor_database_factory.h" | 9 #include "chrome/browser/predictors/predictor_database_factory.h" |
| 10 #include "chrome/browser/profiles/incognito_helpers.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 | 13 |
13 namespace predictors { | 14 namespace predictors { |
14 | 15 |
15 // static | 16 // static |
16 AutocompleteActionPredictor* AutocompleteActionPredictorFactory::GetForProfile( | 17 AutocompleteActionPredictor* AutocompleteActionPredictorFactory::GetForProfile( |
17 Profile* profile) { | 18 Profile* profile) { |
18 return static_cast<AutocompleteActionPredictor*>( | 19 return static_cast<AutocompleteActionPredictor*>( |
19 GetInstance()->GetServiceForProfile(profile, true)); | 20 GetInstance()->GetServiceForProfile(profile, true)); |
20 } | 21 } |
21 | 22 |
22 // static | 23 // static |
23 AutocompleteActionPredictorFactory* | 24 AutocompleteActionPredictorFactory* |
24 AutocompleteActionPredictorFactory::GetInstance() { | 25 AutocompleteActionPredictorFactory::GetInstance() { |
25 return Singleton<AutocompleteActionPredictorFactory>::get(); | 26 return Singleton<AutocompleteActionPredictorFactory>::get(); |
26 } | 27 } |
27 | 28 |
28 AutocompleteActionPredictorFactory::AutocompleteActionPredictorFactory() | 29 AutocompleteActionPredictorFactory::AutocompleteActionPredictorFactory() |
29 : ProfileKeyedServiceFactory("AutocompleteActionPredictor", | 30 : ProfileKeyedServiceFactory("AutocompleteActionPredictor", |
30 ProfileDependencyManager::GetInstance()) { | 31 ProfileDependencyManager::GetInstance()) { |
31 DependsOn(HistoryServiceFactory::GetInstance()); | 32 DependsOn(HistoryServiceFactory::GetInstance()); |
32 DependsOn(PredictorDatabaseFactory::GetInstance()); | 33 DependsOn(PredictorDatabaseFactory::GetInstance()); |
33 } | 34 } |
34 | 35 |
35 AutocompleteActionPredictorFactory::~AutocompleteActionPredictorFactory() {} | 36 AutocompleteActionPredictorFactory::~AutocompleteActionPredictorFactory() {} |
36 | 37 |
37 bool | 38 content::BrowserContext* |
38 AutocompleteActionPredictorFactory::ServiceHasOwnInstanceInIncognito() const { | 39 AutocompleteActionPredictorFactory::GetBrowserContextToUse( |
39 return true; | 40 content::BrowserContext* context) const { |
| 41 return chrome::GetBrowserContextOwnInstanceInIncognito(context); |
40 } | 42 } |
41 | 43 |
42 ProfileKeyedService* | 44 ProfileKeyedService* |
43 AutocompleteActionPredictorFactory::BuildServiceInstanceFor( | 45 AutocompleteActionPredictorFactory::BuildServiceInstanceFor( |
44 content::BrowserContext* profile) const { | 46 content::BrowserContext* profile) const { |
45 return new AutocompleteActionPredictor(static_cast<Profile*>(profile)); | 47 return new AutocompleteActionPredictor(static_cast<Profile*>(profile)); |
46 } | 48 } |
47 | 49 |
48 } // namespace predictors | 50 } // namespace predictors |
OLD | NEW |