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

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

Issue 302433010: Pass an instance of FaviconClient to FaviconService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@latest2
Patch Set: Added include. Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/favicon/favicon_service.cc ('k') | chrome/browser/history/android/sqlite_cursor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_service_factory.cc
diff --git a/chrome/browser/favicon/favicon_service_factory.cc b/chrome/browser/favicon/favicon_service_factory.cc
index 3bfb42579807d0ccb18b109cdb17ad1f072c8a67..46481b3ffe4ea0c04c02c144fb48d14a6113d2ea 100644
--- a/chrome/browser/favicon/favicon_service_factory.cc
+++ b/chrome/browser/favicon/favicon_service_factory.cc
@@ -6,6 +6,7 @@
#include "base/memory/singleton.h"
#include "base/prefs/pref_service.h"
+#include "chrome/browser/favicon/chrome_favicon_client_factory.h"
#include "chrome/browser/favicon/favicon_service.h"
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
@@ -40,13 +41,16 @@ FaviconServiceFactory::FaviconServiceFactory()
"FaviconService",
BrowserContextDependencyManager::GetInstance()) {
DependsOn(HistoryServiceFactory::GetInstance());
+ DependsOn(ChromeFaviconClientFactory::GetInstance());
}
FaviconServiceFactory::~FaviconServiceFactory() {}
KeyedService* FaviconServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
- return new FaviconService(static_cast<Profile*>(profile));
+ FaviconClient* favicon_client =
+ ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile));
+ return new FaviconService(static_cast<Profile*>(profile), favicon_client);
}
bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {
« no previous file with comments | « chrome/browser/favicon/favicon_service.cc ('k') | chrome/browser/history/android/sqlite_cursor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698