Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: chrome/browser/ntp_snippets/content_suggestions_service_factory.cc

Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks
Patch Set: Replace in .mm files Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "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/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 offline_page_suggestions_provider = 120 offline_page_suggestions_provider =
121 base::MakeUnique<OfflinePageSuggestionsProvider>( 121 base::MakeUnique<OfflinePageSuggestionsProvider>(
122 service, service->category_factory(), offline_page_model); 122 service, service->category_factory(), offline_page_model);
123 service->RegisterProvider(std::move(offline_page_suggestions_provider)); 123 service->RegisterProvider(std::move(offline_page_suggestions_provider));
124 } 124 }
125 #endif // OS_ANDROID 125 #endif // OS_ANDROID
126 126
127 // Create the BookmarkSuggestionsProvider. 127 // Create the BookmarkSuggestionsProvider.
128 if (base::FeatureList::IsEnabled( 128 if (base::FeatureList::IsEnabled(
129 ntp_snippets::kBookmarkSuggestionsFeature)) { 129 ntp_snippets::kBookmarkSuggestionsFeature)) {
130 // TODO(pke): GetForBrowserContext
131 BookmarkModel* bookmark_model = 130 BookmarkModel* bookmark_model =
132 BookmarkModelFactory::GetForProfile(profile); 131 BookmarkModelFactory::GetForBrowserContext(profile);
133 std::unique_ptr<BookmarkSuggestionsProvider> bookmark_suggestions_provider = 132 std::unique_ptr<BookmarkSuggestionsProvider> bookmark_suggestions_provider =
134 base::MakeUnique<BookmarkSuggestionsProvider>( 133 base::MakeUnique<BookmarkSuggestionsProvider>(
135 service, service->category_factory(), bookmark_model); 134 service, service->category_factory(), bookmark_model);
136 service->RegisterProvider(std::move(bookmark_suggestions_provider)); 135 service->RegisterProvider(std::move(bookmark_suggestions_provider));
137 } 136 }
138 137
139 // Create the NTPSnippetsService (articles provider). 138 // Create the NTPSnippetsService (articles provider).
140 SigninManagerBase* signin_manager = 139 SigninManagerBase* signin_manager =
141 SigninManagerFactory::GetForProfile(profile); 140 SigninManagerFactory::GetForProfile(profile);
142 OAuth2TokenService* token_service = 141 OAuth2TokenService* token_service =
(...skipping 27 matching lines...) Expand all
170 base::MakeUnique<ImageDecoderImpl>(), request_context.get()), 169 base::MakeUnique<ImageDecoderImpl>(), request_context.get()),
171 base::MakeUnique<ImageDecoderImpl>(), 170 base::MakeUnique<ImageDecoderImpl>(),
172 base::MakeUnique<NTPSnippetsDatabase>(database_dir, task_runner), 171 base::MakeUnique<NTPSnippetsDatabase>(database_dir, task_runner),
173 base::MakeUnique<NTPSnippetsStatusService>(signin_manager, 172 base::MakeUnique<NTPSnippetsStatusService>(signin_manager,
174 profile->GetPrefs())); 173 profile->GetPrefs()));
175 service->set_ntp_snippets_service(ntp_snippets_service.get()); 174 service->set_ntp_snippets_service(ntp_snippets_service.get());
176 service->RegisterProvider(std::move(ntp_snippets_service)); 175 service->RegisterProvider(std::move(ntp_snippets_service));
177 176
178 return service; 177 return service;
179 } 178 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/profile_writer_unittest.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698