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

Unified Diff: chrome/browser/jumplist_win.cc

Issue 10828263: Moving FaviconService to a ProfileKeyedService. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: resyncing with library after revert 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/jumplist_win.cc
===================================================================
--- chrome/browser/jumplist_win.cc (revision 152993)
+++ chrome/browser/jumplist_win.cc (working copy)
@@ -23,6 +23,7 @@
#include "base/win/scoped_comptr.h"
#include "base/win/windows_version.h"
#include "chrome/browser/favicon/favicon_service.h"
+#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/page_usage_data.h"
#include "chrome/browser/history/top_sites.h"
@@ -574,8 +575,8 @@
void JumpList::CancelPendingUpdate() {
if (handle_) {
- FaviconService* favicon_service =
- profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
+ FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
+ profile_, Profile::EXPLICIT_ACCESS);
favicon_service->CancelRequest(handle_);
handle_ = NULL;
}
@@ -699,9 +700,9 @@
url = GURL(icon_urls_.front().first);
}
FaviconService* favicon_service =
- profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
+ FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
handle_ = favicon_service->GetFaviconForURL(
- url, history::FAVICON, &favicon_consumer_,
+ profile_, url, history::FAVICON, &favicon_consumer_,
base::Bind(&JumpList::OnFaviconDataAvailable, base::Unretained(this)));
return true;
}
« no previous file with comments | « chrome/browser/intents/register_intent_handler_helper.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698