Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/ntp_snippets/content_suggestions_service_factory.h" | 5 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/feature_list.h" | 9 #include "base/feature_list.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 #include "components/ntp_snippets/features.h" | 35 #include "components/ntp_snippets/features.h" |
| 36 #include "components/ntp_snippets/ntp_snippets_constants.h" | 36 #include "components/ntp_snippets/ntp_snippets_constants.h" |
| 37 #include "components/ntp_snippets/remote/persistent_scheduler.h" | 37 #include "components/ntp_snippets/remote/persistent_scheduler.h" |
| 38 #include "components/ntp_snippets/remote/remote_suggestions_database.h" | 38 #include "components/ntp_snippets/remote/remote_suggestions_database.h" |
| 39 #include "components/ntp_snippets/remote/remote_suggestions_fetcher.h" | 39 #include "components/ntp_snippets/remote/remote_suggestions_fetcher.h" |
| 40 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h" | 40 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h" |
| 41 #include "components/ntp_snippets/remote/remote_suggestions_status_service.h" | 41 #include "components/ntp_snippets/remote/remote_suggestions_status_service.h" |
| 42 #include "components/ntp_snippets/remote/scheduling_remote_suggestions_provider. h" | 42 #include "components/ntp_snippets/remote/scheduling_remote_suggestions_provider. h" |
| 43 #include "components/ntp_snippets/sessions/foreign_sessions_suggestions_provider .h" | 43 #include "components/ntp_snippets/sessions/foreign_sessions_suggestions_provider .h" |
| 44 #include "components/ntp_snippets/sessions/tab_delegate_sync_adapter.h" | 44 #include "components/ntp_snippets/sessions/tab_delegate_sync_adapter.h" |
| 45 #include "components/offline_pages/core/recent_tabs/recent_tabs_ui_adapter_deleg ate.h" | |
|
vitaliii
2017/02/15 10:12:15
Shouldn't this be in OS_ANDROID block?
dewittj
2017/02/15 19:49:44
Done.
| |
| 45 #include "components/prefs/pref_service.h" | 46 #include "components/prefs/pref_service.h" |
| 46 #include "components/safe_json/safe_json_parser.h" | 47 #include "components/safe_json/safe_json_parser.h" |
| 47 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 48 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
| 48 #include "components/signin/core/browser/signin_manager.h" | 49 #include "components/signin/core/browser/signin_manager.h" |
| 49 #include "components/translate/core/browser/language_model.h" | 50 #include "components/translate/core/browser/language_model.h" |
| 50 #include "components/version_info/version_info.h" | 51 #include "components/version_info/version_info.h" |
| 51 #include "content/public/browser/browser_context.h" | 52 #include "content/public/browser/browser_context.h" |
| 52 #include "content/public/browser/browser_thread.h" | 53 #include "content/public/browser/browser_thread.h" |
| 53 #include "content/public/browser/storage_partition.h" | 54 #include "content/public/browser/storage_partition.h" |
| 54 #include "google_apis/google_api_keys.h" | 55 #include "google_apis/google_api_keys.h" |
| 55 #include "net/url_request/url_request_context_getter.h" | 56 #include "net/url_request/url_request_context_getter.h" |
| 56 | 57 |
| 57 #if defined(OS_ANDROID) | 58 #if defined(OS_ANDROID) |
| 58 #include "chrome/browser/android/chrome_feature_list.h" | 59 #include "chrome/browser/android/chrome_feature_list.h" |
| 59 #include "chrome/browser/android/ntp/ntp_snippets_launcher.h" | 60 #include "chrome/browser/android/ntp/ntp_snippets_launcher.h" |
| 60 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h" | 61 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h" |
| 62 #include "chrome/browser/android/offline_pages/request_coordinator_factory.h" | |
| 61 #include "chrome/browser/download/download_history.h" | 63 #include "chrome/browser/download/download_history.h" |
| 62 #include "chrome/browser/download/download_service.h" | 64 #include "chrome/browser/download/download_service.h" |
| 63 #include "chrome/browser/download/download_service_factory.h" | 65 #include "chrome/browser/download/download_service_factory.h" |
| 64 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" | 66 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" |
| 65 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h" | 67 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h" |
| 66 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h" | 68 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h" |
| 69 #include "components/offline_pages/core/background/request_coordinator.h" | |
| 67 #include "components/offline_pages/core/offline_page_feature.h" | 70 #include "components/offline_pages/core/offline_page_feature.h" |
| 68 #include "components/offline_pages/core/offline_page_model.h" | 71 #include "components/offline_pages/core/offline_page_model.h" |
| 69 #include "components/physical_web/data_source/physical_web_data_source.h" | 72 #include "components/physical_web/data_source/physical_web_data_source.h" |
| 70 | 73 |
| 71 using content::DownloadManager; | 74 using content::DownloadManager; |
| 72 using ntp_snippets::PhysicalWebPageSuggestionsProvider; | 75 using ntp_snippets::PhysicalWebPageSuggestionsProvider; |
| 73 using ntp_snippets::RecentTabSuggestionsProvider; | 76 using ntp_snippets::RecentTabSuggestionsProvider; |
| 74 using offline_pages::OfflinePageModel; | 77 using offline_pages::OfflinePageModel; |
| 78 using offline_pages::RequestCoordinator; | |
| 75 using offline_pages::OfflinePageModelFactory; | 79 using offline_pages::OfflinePageModelFactory; |
| 80 using offline_pages::RequestCoordinatorFactory; | |
| 76 using physical_web::PhysicalWebDataSource; | 81 using physical_web::PhysicalWebDataSource; |
| 77 #endif // OS_ANDROID | 82 #endif // OS_ANDROID |
| 78 | 83 |
| 79 using bookmarks::BookmarkModel; | 84 using bookmarks::BookmarkModel; |
| 80 using content::BrowserThread; | 85 using content::BrowserThread; |
| 81 using history::HistoryService; | 86 using history::HistoryService; |
| 82 using image_fetcher::ImageFetcherImpl; | 87 using image_fetcher::ImageFetcherImpl; |
| 83 using ntp_snippets::BookmarkSuggestionsProvider; | 88 using ntp_snippets::BookmarkSuggestionsProvider; |
| 84 using ntp_snippets::CategoryRanker; | 89 using ntp_snippets::CategoryRanker; |
| 85 using ntp_snippets::ContentSuggestionsService; | 90 using ntp_snippets::ContentSuggestionsService; |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 112 #if defined(OS_ANDROID) | 117 #if defined(OS_ANDROID) |
| 113 | 118 |
| 114 bool IsRecentTabProviderEnabled() { | 119 bool IsRecentTabProviderEnabled() { |
| 115 return base::FeatureList::IsEnabled( | 120 return base::FeatureList::IsEnabled( |
| 116 ntp_snippets::kRecentOfflineTabSuggestionsFeature) && | 121 ntp_snippets::kRecentOfflineTabSuggestionsFeature) && |
| 117 base::FeatureList::IsEnabled( | 122 base::FeatureList::IsEnabled( |
| 118 offline_pages::kOffliningRecentPagesFeature); | 123 offline_pages::kOffliningRecentPagesFeature); |
| 119 } | 124 } |
| 120 | 125 |
| 121 void RegisterRecentTabProvider(OfflinePageModel* offline_page_model, | 126 void RegisterRecentTabProvider(OfflinePageModel* offline_page_model, |
| 127 RequestCoordinator* request_coordinator, | |
| 122 ContentSuggestionsService* service, | 128 ContentSuggestionsService* service, |
| 123 PrefService* pref_service) { | 129 PrefService* pref_service) { |
| 124 auto provider = base::MakeUnique<RecentTabSuggestionsProvider>( | 130 auto provider = base::MakeUnique<RecentTabSuggestionsProvider>( |
| 125 service, offline_page_model, pref_service); | 131 service, offline_page_model, request_coordinator, pref_service); |
| 126 service->RegisterProvider(std::move(provider)); | 132 service->RegisterProvider(std::move(provider)); |
| 127 } | 133 } |
| 128 | 134 |
| 129 void RegisterDownloadsProvider(OfflinePageModel* offline_page_model, | 135 void RegisterDownloadsProvider(OfflinePageModel* offline_page_model, |
| 130 DownloadManager* download_manager, | 136 DownloadManager* download_manager, |
| 131 DownloadHistory* download_history, | 137 DownloadHistory* download_history, |
| 132 ContentSuggestionsService* service, | 138 ContentSuggestionsService* service, |
| 133 PrefService* pref_service) { | 139 PrefService* pref_service) { |
| 134 auto provider = base::MakeUnique<DownloadSuggestionsProvider>( | 140 auto provider = base::MakeUnique<DownloadSuggestionsProvider>( |
| 135 service, offline_page_model, download_manager, download_history, | 141 service, offline_page_model, download_manager, download_history, |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 282 std::unique_ptr<CategoryRanker> category_ranker = | 288 std::unique_ptr<CategoryRanker> category_ranker = |
| 283 ntp_snippets::BuildSelectedCategoryRanker( | 289 ntp_snippets::BuildSelectedCategoryRanker( |
| 284 pref_service, base::MakeUnique<base::DefaultClock>()); | 290 pref_service, base::MakeUnique<base::DefaultClock>()); |
| 285 auto* service = | 291 auto* service = |
| 286 new ContentSuggestionsService(State::ENABLED, signin_manager, | 292 new ContentSuggestionsService(State::ENABLED, signin_manager, |
| 287 history_service, pref_service, std::move(category_ranker)); | 293 history_service, pref_service, std::move(category_ranker)); |
| 288 | 294 |
| 289 #if defined(OS_ANDROID) | 295 #if defined(OS_ANDROID) |
| 290 OfflinePageModel* offline_page_model = | 296 OfflinePageModel* offline_page_model = |
| 291 OfflinePageModelFactory::GetForBrowserContext(profile); | 297 OfflinePageModelFactory::GetForBrowserContext(profile); |
| 298 RequestCoordinator* request_coordinator = | |
| 299 RequestCoordinatorFactory::GetForBrowserContext(profile); | |
| 292 DownloadManager* download_manager = | 300 DownloadManager* download_manager = |
| 293 content::BrowserContext::GetDownloadManager(profile); | 301 content::BrowserContext::GetDownloadManager(profile); |
| 294 DownloadService* download_service = | 302 DownloadService* download_service = |
| 295 DownloadServiceFactory::GetForBrowserContext(profile); | 303 DownloadServiceFactory::GetForBrowserContext(profile); |
| 296 DownloadHistory* download_history = download_service->GetDownloadHistory(); | 304 DownloadHistory* download_history = download_service->GetDownloadHistory(); |
| 297 PhysicalWebDataSource* physical_web_data_source = | 305 PhysicalWebDataSource* physical_web_data_source = |
| 298 g_browser_process->GetPhysicalWebDataSource(); | 306 g_browser_process->GetPhysicalWebDataSource(); |
| 299 #endif // OS_ANDROID | 307 #endif // OS_ANDROID |
| 300 BookmarkModel* bookmark_model = | 308 BookmarkModel* bookmark_model = |
| 301 BookmarkModelFactory::GetForBrowserContext(profile); | 309 BookmarkModelFactory::GetForBrowserContext(profile); |
| 302 OAuth2TokenService* token_service = | 310 OAuth2TokenService* token_service = |
| 303 ProfileOAuth2TokenServiceFactory::GetForProfile(profile); | 311 ProfileOAuth2TokenServiceFactory::GetForProfile(profile); |
| 304 SyncService* sync_service = | 312 SyncService* sync_service = |
| 305 ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(profile); | 313 ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(profile); |
| 306 LanguageModel* language_model = | 314 LanguageModel* language_model = |
| 307 LanguageModelFactory::GetInstance()->GetForBrowserContext(profile); | 315 LanguageModelFactory::GetInstance()->GetForBrowserContext(profile); |
| 308 | 316 |
| 309 #if defined(OS_ANDROID) | 317 #if defined(OS_ANDROID) |
| 310 if (IsRecentTabProviderEnabled()) { | 318 if (IsRecentTabProviderEnabled()) { |
| 311 RegisterRecentTabProvider(offline_page_model, service, pref_service); | 319 RegisterRecentTabProvider(offline_page_model, request_coordinator, service, |
| 320 pref_service); | |
| 312 } | 321 } |
| 313 | 322 |
| 314 bool show_asset_downloads = | 323 bool show_asset_downloads = |
| 315 base::FeatureList::IsEnabled(features::kAssetDownloadSuggestionsFeature); | 324 base::FeatureList::IsEnabled(features::kAssetDownloadSuggestionsFeature); |
| 316 bool show_offline_page_downloads = base::FeatureList::IsEnabled( | 325 bool show_offline_page_downloads = base::FeatureList::IsEnabled( |
| 317 features::kOfflinePageDownloadSuggestionsFeature); | 326 features::kOfflinePageDownloadSuggestionsFeature); |
| 318 if (show_asset_downloads || show_offline_page_downloads) { | 327 if (show_asset_downloads || show_offline_page_downloads) { |
| 319 RegisterDownloadsProvider( | 328 RegisterDownloadsProvider( |
| 320 show_offline_page_downloads ? offline_page_model : nullptr, | 329 show_offline_page_downloads ? offline_page_model : nullptr, |
| 321 show_asset_downloads ? download_manager : nullptr, download_history, | 330 show_asset_downloads ? download_manager : nullptr, download_history, |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 345 ntp_snippets::kForeignSessionsSuggestionsFeature)) { | 354 ntp_snippets::kForeignSessionsSuggestionsFeature)) { |
| 346 RegisterForeignSessionsProvider(sync_service, service, pref_service); | 355 RegisterForeignSessionsProvider(sync_service, service, pref_service); |
| 347 } | 356 } |
| 348 | 357 |
| 349 return service; | 358 return service; |
| 350 | 359 |
| 351 #else | 360 #else |
| 352 return nullptr; | 361 return nullptr; |
| 353 #endif // CONTENT_SUGGESTIONS_ENABLED | 362 #endif // CONTENT_SUGGESTIONS_ENABLED |
| 354 } | 363 } |
| OLD | NEW |