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

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

Issue 370663002: Revert 281304 "Pass an instance of FaviconClient to FaviconService." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Index: trunk/src/chrome/browser/favicon/favicon_service_factory.cc
===================================================================
--- trunk/src/chrome/browser/favicon/favicon_service_factory.cc (revision 281307)
+++ trunk/src/chrome/browser/favicon/favicon_service_factory.cc (working copy)
@@ -6,7 +6,6 @@
#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"
@@ -41,16 +40,13 @@
"FaviconService",
BrowserContextDependencyManager::GetInstance()) {
DependsOn(HistoryServiceFactory::GetInstance());
- DependsOn(ChromeFaviconClientFactory::GetInstance());
}
FaviconServiceFactory::~FaviconServiceFactory() {}
KeyedService* FaviconServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
- FaviconClient* favicon_client =
- ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile));
- return new FaviconService(static_cast<Profile*>(profile), favicon_client);
+ return new FaviconService(static_cast<Profile*>(profile));
}
bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {

Powered by Google App Engine
This is Rietveld 408576698