chrome/browser/favicon/favicon_handler.cc - Issue 291643002: Move favicon callbacks to favicon_base

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 291643002: Move favicon callbacks to favicon_base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Android unittest Created 6 years, 7 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/favicon/favicon_handler.h ('k') | chrome/browser/favicon/favicon_handler_unittest.cc » ('j') | chrome/browser/favicon/favicon_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/favicon/favicon_handler.cc

diff --git a/chrome/browser/favicon/favicon_handler.cc b/chrome/browser/favicon/favicon_handler.cc

index 7510a9944a0cc5d70aef4dbb522b56dbfd3fd572..1b31c5cf0fe348ff0f236b58a27c56974f0d1668 100644

--- a/chrome/browser/favicon/favicon_handler.cc

+++ b/chrome/browser/favicon/favicon_handler.cc

@@ -12,6 +12,7 @@

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/memory/ref_counted_memory.h"

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

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

#include "chrome/browser/favicon/favicon_util.h"

#include "components/favicon_base/select_favicon_frames.h"

@@ -508,7 +509,7 @@ void FaviconHandler::UpdateFaviconMappingAndFetch(

const GURL& page_url,

const GURL& icon_url,

favicon_base::IconType icon_type,

- const FaviconService::FaviconResultsCallback& callback,

+ const favicon_base::FaviconResultsCallback& callback,

base::CancelableTaskTracker* tracker) {

// TODO(pkotwicz): pass in all of |image_urls_| to

// UpdateFaviconMappingsAndFetch().

@@ -521,7 +522,7 @@ void FaviconHandler::UpdateFaviconMappingAndFetch(

void FaviconHandler::GetFaviconFromFaviconService(

const GURL& icon_url,

favicon_base::IconType icon_type,

- const FaviconService::FaviconResultsCallback& callback,

+ const favicon_base::FaviconResultsCallback& callback,

base::CancelableTaskTracker* tracker) {

client_->GetFaviconService()->GetFavicon(

icon_url, icon_type, preferred_icon_size(), callback, tracker);

@@ -530,7 +531,7 @@ void FaviconHandler::GetFaviconFromFaviconService(

void FaviconHandler::GetFaviconForURLFromFaviconService(

const GURL& page_url,

int icon_types,

- const FaviconService::FaviconResultsCallback& callback,

+ const favicon_base::FaviconResultsCallback& callback,

base::CancelableTaskTracker* tracker) {

client_->GetFaviconService()->GetFaviconForURL(

FaviconService::FaviconForURLParams(

« no previous file with comments | « chrome/browser/favicon/favicon_handler.h ('k') | chrome/browser/favicon/favicon_handler_unittest.cc » ('j') | chrome/browser/favicon/favicon_service.h » ('J')