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

Unified Diff: chrome/browser/favicon/favicon_service.cc

Issue 56143002: Make FaviconService() use Porfile as parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove scope_ptr Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/favicon/favicon_service.h ('k') | chrome/browser/favicon/favicon_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_service.cc
diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc
index 9f0ff332cd1a5fe2e1caa498497ff1eb9ec0a895..e66377fb382f1ec40602727d165a6badd1e996c0 100644
--- a/chrome/browser/favicon/favicon_service.cc
+++ b/chrome/browser/favicon/favicon_service.cc
@@ -63,8 +63,10 @@ CancelableTaskTracker::TaskId GetFaviconForChromeURL(
} // namespace
-FaviconService::FaviconService(HistoryService* history_service)
- : history_service_(history_service) {
+FaviconService::FaviconService(Profile* profile)
+ : profile_(profile) {
+ history_service_ = HistoryServiceFactory::GetForProfile(
sky 2013/11/01 21:54:35 Move this to member initializer.
+ profile, Profile::EXPLICIT_ACCESS);
}
// static
@@ -323,7 +325,7 @@ CancelableTaskTracker::TaskId FaviconService::GetFaviconForURLImpl(
CancelableTaskTracker* tracker) {
if (params.page_url.SchemeIs(chrome::kChromeUIScheme) ||
params.page_url.SchemeIs(extensions::kExtensionScheme)) {
- return GetFaviconForChromeURL(params.profile, params.page_url,
+ return GetFaviconForChromeURL(profile_, params.page_url,
desired_scale_factors, callback, tracker);
} else if (history_service_) {
return history_service_->GetFaviconsForURL(params.page_url,
« no previous file with comments | « chrome/browser/favicon/favicon_service.h ('k') | chrome/browser/favicon/favicon_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698