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/ntp_snippets/ios_chrome_content_suggestions_service
_factory.h" | 5 #include "ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service
_factory.h" |
6 | 6 |
7 #include "base/feature_list.h" | 7 #include "base/feature_list.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "base/memory/singleton.h" | 11 #include "base/memory/singleton.h" |
12 #include "base/threading/sequenced_worker_pool.h" | 12 #include "base/threading/sequenced_worker_pool.h" |
13 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
14 #include "base/time/default_clock.h" | 14 #include "base/time/default_clock.h" |
15 #include "base/values.h" | 15 #include "base/values.h" |
16 #include "components/bookmarks/browser/bookmark_model.h" | 16 #include "components/bookmarks/browser/bookmark_model.h" |
17 #include "components/image_fetcher/core/image_decoder.h" | 17 #include "components/image_fetcher/core/image_decoder.h" |
18 #include "components/image_fetcher/core/image_fetcher.h" | 18 #include "components/image_fetcher/core/image_fetcher.h" |
19 #include "components/image_fetcher/core/image_fetcher_impl.h" | 19 #include "components/image_fetcher/core/image_fetcher_impl.h" |
20 #include "components/image_fetcher/ios/ios_image_decoder_impl.h" | 20 #include "components/image_fetcher/ios/ios_image_decoder_impl.h" |
21 #include "components/keyed_service/core/service_access_type.h" | 21 #include "components/keyed_service/core/service_access_type.h" |
22 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 22 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
23 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" | 23 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" |
24 #include "components/ntp_snippets/category_rankers/category_ranker.h" | 24 #include "components/ntp_snippets/category_rankers/category_ranker.h" |
25 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h
" | 25 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h
" |
26 #include "components/ntp_snippets/category_rankers/constant_category_ranker.h" | 26 #include "components/ntp_snippets/category_rankers/constant_category_ranker.h" |
27 #include "components/ntp_snippets/content_suggestions_service.h" | 27 #include "components/ntp_snippets/content_suggestions_service.h" |
28 #include "components/ntp_snippets/features.h" | 28 #include "components/ntp_snippets/features.h" |
29 #include "components/ntp_snippets/ntp_snippets_constants.h" | 29 #include "components/ntp_snippets/ntp_snippets_constants.h" |
| 30 #include "components/ntp_snippets/reading_list/reading_list_suggestions_provider
.h" |
30 #include "components/ntp_snippets/remote/persistent_scheduler.h" | 31 #include "components/ntp_snippets/remote/persistent_scheduler.h" |
31 #include "components/ntp_snippets/remote/remote_suggestions_database.h" | 32 #include "components/ntp_snippets/remote/remote_suggestions_database.h" |
32 #include "components/ntp_snippets/remote/remote_suggestions_fetcher.h" | 33 #include "components/ntp_snippets/remote/remote_suggestions_fetcher.h" |
33 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h" | 34 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h" |
34 #include "components/ntp_snippets/remote/remote_suggestions_scheduler_impl.h" | 35 #include "components/ntp_snippets/remote/remote_suggestions_scheduler_impl.h" |
35 #include "components/ntp_snippets/remote/remote_suggestions_status_service.h" | 36 #include "components/ntp_snippets/remote/remote_suggestions_status_service.h" |
36 #include "components/ntp_snippets/user_classifier.h" | 37 #include "components/ntp_snippets/user_classifier.h" |
| 38 #include "components/reading_list/core/reading_list_model.h" |
37 #include "components/signin/core/browser/signin_manager.h" | 39 #include "components/signin/core/browser/signin_manager.h" |
38 #include "components/version_info/version_info.h" | 40 #include "components/version_info/version_info.h" |
39 #include "google_apis/google_api_keys.h" | 41 #include "google_apis/google_api_keys.h" |
40 #include "ios/chrome/browser/application_context.h" | 42 #include "ios/chrome/browser/application_context.h" |
41 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" | 43 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" |
42 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 44 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
43 #include "ios/chrome/browser/history/history_service_factory.h" | 45 #include "ios/chrome/browser/history/history_service_factory.h" |
| 46 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h" |
44 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h" | 47 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h" |
45 #include "ios/chrome/browser/signin/signin_manager_factory.h" | 48 #include "ios/chrome/browser/signin/signin_manager_factory.h" |
46 #include "ios/chrome/common/channel_info.h" | 49 #include "ios/chrome/common/channel_info.h" |
47 #include "ios/web/public/browser_state.h" | 50 #include "ios/web/public/browser_state.h" |
48 #include "ios/web/public/web_thread.h" | 51 #include "ios/web/public/web_thread.h" |
49 #include "net/url_request/url_request_context_getter.h" | 52 #include "net/url_request/url_request_context_getter.h" |
50 | 53 |
51 using bookmarks::BookmarkModel; | 54 using bookmarks::BookmarkModel; |
52 using history::HistoryService; | 55 using history::HistoryService; |
53 using image_fetcher::CreateIOSImageDecoder; | 56 using image_fetcher::CreateIOSImageDecoder; |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 | 102 |
100 IOSChromeContentSuggestionsServiceFactory:: | 103 IOSChromeContentSuggestionsServiceFactory:: |
101 IOSChromeContentSuggestionsServiceFactory() | 104 IOSChromeContentSuggestionsServiceFactory() |
102 : BrowserStateKeyedServiceFactory( | 105 : BrowserStateKeyedServiceFactory( |
103 "ContentSuggestionsService", | 106 "ContentSuggestionsService", |
104 BrowserStateDependencyManager::GetInstance()) { | 107 BrowserStateDependencyManager::GetInstance()) { |
105 DependsOn(BookmarkModelFactory::GetInstance()); | 108 DependsOn(BookmarkModelFactory::GetInstance()); |
106 DependsOn(ios::HistoryServiceFactory::GetInstance()); | 109 DependsOn(ios::HistoryServiceFactory::GetInstance()); |
107 DependsOn(OAuth2TokenServiceFactory::GetInstance()); | 110 DependsOn(OAuth2TokenServiceFactory::GetInstance()); |
108 DependsOn(ios::SigninManagerFactory::GetInstance()); | 111 DependsOn(ios::SigninManagerFactory::GetInstance()); |
| 112 DependsOn(ReadingListModelFactory::GetInstance()); |
109 } | 113 } |
110 | 114 |
111 IOSChromeContentSuggestionsServiceFactory:: | 115 IOSChromeContentSuggestionsServiceFactory:: |
112 ~IOSChromeContentSuggestionsServiceFactory() {} | 116 ~IOSChromeContentSuggestionsServiceFactory() {} |
113 | 117 |
114 std::unique_ptr<KeyedService> | 118 std::unique_ptr<KeyedService> |
115 IOSChromeContentSuggestionsServiceFactory::BuildServiceInstanceFor( | 119 IOSChromeContentSuggestionsServiceFactory::BuildServiceInstanceFor( |
116 web::BrowserState* browser_state) const { | 120 web::BrowserState* browser_state) const { |
117 using State = ContentSuggestionsService::State; | 121 using State = ContentSuggestionsService::State; |
118 ios::ChromeBrowserState* chrome_browser_state = | 122 ios::ChromeBrowserState* chrome_browser_state = |
(...skipping 29 matching lines...) Expand all Loading... |
148 // Create the BookmarkSuggestionsProvider. | 152 // Create the BookmarkSuggestionsProvider. |
149 if (base::FeatureList::IsEnabled(ntp_snippets::kBookmarkSuggestionsFeature)) { | 153 if (base::FeatureList::IsEnabled(ntp_snippets::kBookmarkSuggestionsFeature)) { |
150 BookmarkModel* bookmark_model = | 154 BookmarkModel* bookmark_model = |
151 BookmarkModelFactory::GetForBrowserState(chrome_browser_state); | 155 BookmarkModelFactory::GetForBrowserState(chrome_browser_state); |
152 std::unique_ptr<BookmarkSuggestionsProvider> bookmark_suggestions_provider = | 156 std::unique_ptr<BookmarkSuggestionsProvider> bookmark_suggestions_provider = |
153 base::MakeUnique<BookmarkSuggestionsProvider>(service.get(), | 157 base::MakeUnique<BookmarkSuggestionsProvider>(service.get(), |
154 bookmark_model, prefs); | 158 bookmark_model, prefs); |
155 service->RegisterProvider(std::move(bookmark_suggestions_provider)); | 159 service->RegisterProvider(std::move(bookmark_suggestions_provider)); |
156 } | 160 } |
157 | 161 |
| 162 // Create the ReadingListSuggestionsProvider. |
| 163 ReadingListModel* reading_list_model = |
| 164 ReadingListModelFactory::GetForBrowserState(chrome_browser_state); |
| 165 std::unique_ptr<ntp_snippets::ReadingListSuggestionsProvider> |
| 166 reading_list_suggestions_provider = |
| 167 base::MakeUnique<ntp_snippets::ReadingListSuggestionsProvider>( |
| 168 service.get(), reading_list_model); |
| 169 service->RegisterProvider(std::move(reading_list_suggestions_provider)); |
| 170 |
158 if (base::FeatureList::IsEnabled(ntp_snippets::kArticleSuggestionsFeature)) { | 171 if (base::FeatureList::IsEnabled(ntp_snippets::kArticleSuggestionsFeature)) { |
159 // Create the RemoteSuggestionsProvider (articles provider). | 172 // Create the RemoteSuggestionsProvider (articles provider). |
160 OAuth2TokenService* token_service = | 173 OAuth2TokenService* token_service = |
161 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state); | 174 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state); |
162 scoped_refptr<net::URLRequestContextGetter> request_context = | 175 scoped_refptr<net::URLRequestContextGetter> request_context = |
163 browser_state->GetRequestContext(); | 176 browser_state->GetRequestContext(); |
164 base::FilePath database_dir( | 177 base::FilePath database_dir( |
165 browser_state->GetStatePath().Append(ntp_snippets::kDatabaseFolder)); | 178 browser_state->GetStatePath().Append(ntp_snippets::kDatabaseFolder)); |
166 scoped_refptr<base::SequencedTaskRunner> task_runner = | 179 scoped_refptr<base::SequencedTaskRunner> task_runner = |
167 web::WebThread::GetBlockingPool() | 180 web::WebThread::GetBlockingPool() |
(...skipping 26 matching lines...) Expand all Loading... |
194 prefs)); | 207 prefs)); |
195 | 208 |
196 service->remote_suggestions_scheduler()->SetProvider(provider.get()); | 209 service->remote_suggestions_scheduler()->SetProvider(provider.get()); |
197 service->set_remote_suggestions_provider(provider.get()); | 210 service->set_remote_suggestions_provider(provider.get()); |
198 service->RegisterProvider(std::move(provider)); | 211 service->RegisterProvider(std::move(provider)); |
199 } | 212 } |
200 | 213 |
201 // TODO(crbug.com/703565): remove std::move() once Xcode 9.0+ is required. | 214 // TODO(crbug.com/703565): remove std::move() once Xcode 9.0+ is required. |
202 return std::move(service); | 215 return std::move(service); |
203 } | 216 } |
OLD | NEW |