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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/search_engines/template_url_table_model.cc

Issue 10873022: Revert 152904 - Moving FaviconService to a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search_engines/template_url_table_model.cc
===================================================================
--- chrome/browser/ui/search_engines/template_url_table_model.cc (revision 152958)
+++ chrome/browser/ui/search_engines/template_url_table_model.cc (working copy)
@@ -10,7 +10,6 @@
#include "base/stl_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/favicon/favicon_service.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
@@ -76,8 +75,9 @@
void LoadFavicon() {
load_state_ = LOADED;
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- model_->template_url_service()->profile(), Profile::EXPLICIT_ACCESS);
+ FaviconService* favicon_service =
+ model_->template_url_service()->profile()->GetFaviconService(
+ Profile::EXPLICIT_ACCESS);
if (!favicon_service)
return;
GURL favicon_url = template_url()->favicon_url();
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698