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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/instant/instant_controller.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/importer/profile_writer.cc ('k') | chrome/browser/intents/register_intent_handler_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.cc
===================================================================
--- chrome/browser/instant/instant_controller.cc (revision 152958)
+++ chrome/browser/instant/instant_controller.cc (working copy)
@@ -8,7 +8,6 @@
#include "base/i18n/case_conversion.h"
#include "base/metrics/histogram.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/history/history_tab_helper.h"
@@ -288,8 +287,8 @@
preview->history_tab_helper()->UpdateHistoryPageTitle(*entry);
// Update the favicon.
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- preview->profile(), Profile::EXPLICIT_ACCESS);
+ FaviconService* favicon_service =
+ preview->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
if (favicon_service && entry->GetFavicon().valid &&
entry->GetFavicon().image.IsEmpty()) {
std::vector<unsigned char> image_data;
« no previous file with comments | « chrome/browser/importer/profile_writer.cc ('k') | chrome/browser/intents/register_intent_handler_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698