OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ios/chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 5 #include "ios/chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
7 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
8 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 9 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
9 #include "components/omnibox/browser/autocomplete_classifier.h" | 10 #include "components/omnibox/browser/autocomplete_classifier.h" |
10 #include "components/omnibox/browser/autocomplete_controller.h" | 11 #include "components/omnibox/browser/autocomplete_controller.h" |
11 #include "ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.h" | 12 #include "ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.h" |
12 #include "ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.h" | 13 #include "ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.h" |
13 #include "ios/chrome/browser/autocomplete/in_memory_url_index_factory.h" | 14 #include "ios/chrome/browser/autocomplete/in_memory_url_index_factory.h" |
14 #include "ios/chrome/browser/autocomplete/shortcuts_backend_factory.h" | 15 #include "ios/chrome/browser/autocomplete/shortcuts_backend_factory.h" |
15 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" | 16 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" |
16 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 17 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
17 #include "ios/chrome/browser/search_engines/template_url_service_factory.h" | 18 #include "ios/chrome/browser/search_engines/template_url_service_factory.h" |
18 | 19 |
19 namespace ios { | 20 namespace ios { |
20 namespace { | 21 namespace { |
21 | 22 |
22 scoped_ptr<KeyedService> BuildAutocompleteClassifier( | 23 std::unique_ptr<KeyedService> BuildAutocompleteClassifier( |
23 web::BrowserState* context) { | 24 web::BrowserState* context) { |
24 ios::ChromeBrowserState* browser_state = | 25 ios::ChromeBrowserState* browser_state = |
25 ios::ChromeBrowserState::FromBrowserState(context); | 26 ios::ChromeBrowserState::FromBrowserState(context); |
26 return make_scoped_ptr(new AutocompleteClassifier( | 27 return base::WrapUnique(new AutocompleteClassifier( |
27 make_scoped_ptr(new AutocompleteController( | 28 base::WrapUnique(new AutocompleteController( |
28 make_scoped_ptr(new AutocompleteProviderClientImpl(browser_state)), | 29 base::WrapUnique(new AutocompleteProviderClientImpl(browser_state)), |
29 nullptr, AutocompleteClassifier::kDefaultOmniboxProviders)), | 30 nullptr, AutocompleteClassifier::kDefaultOmniboxProviders)), |
30 make_scoped_ptr(new AutocompleteSchemeClassifierImpl))); | 31 base::WrapUnique(new AutocompleteSchemeClassifierImpl))); |
31 } | 32 } |
32 | 33 |
33 } // namespace | 34 } // namespace |
34 | 35 |
35 // static | 36 // static |
36 AutocompleteClassifier* AutocompleteClassifierFactory::GetForBrowserState( | 37 AutocompleteClassifier* AutocompleteClassifierFactory::GetForBrowserState( |
37 ios::ChromeBrowserState* browser_state) { | 38 ios::ChromeBrowserState* browser_state) { |
38 return static_cast<AutocompleteClassifier*>( | 39 return static_cast<AutocompleteClassifier*>( |
39 GetInstance()->GetServiceForBrowserState(browser_state, true)); | 40 GetInstance()->GetServiceForBrowserState(browser_state, true)); |
40 } | 41 } |
(...skipping 13 matching lines...) Expand all Loading... |
54 : BrowserStateKeyedServiceFactory( | 55 : BrowserStateKeyedServiceFactory( |
55 "AutocompleteClassifier", | 56 "AutocompleteClassifier", |
56 BrowserStateDependencyManager::GetInstance()) { | 57 BrowserStateDependencyManager::GetInstance()) { |
57 DependsOn(ios::InMemoryURLIndexFactory::GetInstance()); | 58 DependsOn(ios::InMemoryURLIndexFactory::GetInstance()); |
58 DependsOn(ios::TemplateURLServiceFactory::GetInstance()); | 59 DependsOn(ios::TemplateURLServiceFactory::GetInstance()); |
59 DependsOn(ios::ShortcutsBackendFactory::GetInstance()); | 60 DependsOn(ios::ShortcutsBackendFactory::GetInstance()); |
60 } | 61 } |
61 | 62 |
62 AutocompleteClassifierFactory::~AutocompleteClassifierFactory() {} | 63 AutocompleteClassifierFactory::~AutocompleteClassifierFactory() {} |
63 | 64 |
64 scoped_ptr<KeyedService> AutocompleteClassifierFactory::BuildServiceInstanceFor( | 65 std::unique_ptr<KeyedService> |
| 66 AutocompleteClassifierFactory::BuildServiceInstanceFor( |
65 web::BrowserState* context) const { | 67 web::BrowserState* context) const { |
66 return BuildAutocompleteClassifier(context); | 68 return BuildAutocompleteClassifier(context); |
67 } | 69 } |
68 | 70 |
69 web::BrowserState* AutocompleteClassifierFactory::GetBrowserStateToUse( | 71 web::BrowserState* AutocompleteClassifierFactory::GetBrowserStateToUse( |
70 web::BrowserState* context) const { | 72 web::BrowserState* context) const { |
71 return GetBrowserStateRedirectedInIncognito(context); | 73 return GetBrowserStateRedirectedInIncognito(context); |
72 } | 74 } |
73 | 75 |
74 bool AutocompleteClassifierFactory::ServiceIsNULLWhileTesting() const { | 76 bool AutocompleteClassifierFactory::ServiceIsNULLWhileTesting() const { |
75 return true; | 77 return true; |
76 } | 78 } |
77 | 79 |
78 } // namespace ios | 80 } // namespace ios |
OLD | NEW |