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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 10857037: Make FaviconService a ProfileKeyedService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the tests Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 34b30d98b984260434fa7ceea8fdad6a210dfde3..7963b80f4770a4954e322a927268935756aff3c6 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -41,6 +41,7 @@
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/user_script_master.h"
#include "chrome/browser/favicon/favicon_service.h"
+#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/history_service_factory.h"
@@ -716,11 +717,7 @@ content::ResourceContext* ProfileImpl::GetResourceContext() {
}
FaviconService* ProfileImpl::GetFaviconService(ServiceAccessType sat) {
Elliot Glaysher 2012/08/16 19:37:49 This is OK as long as you plan to come back and pu
andreip3000 2012/08/17 09:34:57 Yes, that's my next patch. I looked into doing thi
- if (!favicon_service_created_) {
- favicon_service_created_ = true;
- favicon_service_.reset(new FaviconService(this));
- }
- return favicon_service_.get();
+ return FaviconServiceFactory::GetForProfile(this);
}
net::URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() {

Powered by Google App Engine
This is Rietveld 408576698