chrome/browser/favicon/favicon_handler.cc - Issue 10828263: Moving FaviconService to a ProfileKeyedService.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/favicon/favicon_handler.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:

Index: chrome/browser/favicon/favicon_handler.cc

===================================================================

--- chrome/browser/favicon/favicon_handler.cc (revision 152993)

+++ chrome/browser/favicon/favicon_handler.cc (working copy)

@@ -13,6 +13,7 @@

#include "base/memory/ref_counted_memory.h"

#include "chrome/browser/bookmarks/bookmark_model.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

+#include "chrome/browser/favicon/favicon_service_factory.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/icon_messages.h"

#include "content/public/browser/favicon_status.h"

@@ -157,7 +158,8 @@

}

FaviconService* FaviconHandler::GetFaviconService() {

- return profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);

+ return FaviconServiceFactory::GetForProfile(

+ profile_, Profile::EXPLICIT_ACCESS);

}

bool FaviconHandler::UpdateFaviconCandidate(const GURL& url,

@@ -372,8 +374,8 @@

int icon_types,

CancelableRequestConsumerBase* consumer,

const FaviconService::FaviconDataCallback& callback) {

- GetFaviconService()->GetFaviconForURL(page_url, icon_types, consumer,

- callback);

+ GetFaviconService()->GetFaviconForURL(profile_, page_url, icon_types,

+ consumer, callback);

}

void FaviconHandler::SetHistoryFavicon(

« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.cc ('k') | chrome/browser/favicon/favicon_service.h » ('j') | no next file with comments »