chrome/browser/ui/webui/favicon_source.cc - Issue 10870022: Change FaviconData to be able to return data for multiple bitmaps for same icon URL

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/ui/webui/favicon_source.cc

Issue 10870022: Change FaviconData to be able to return data for multiple bitmaps for same icon URL (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

« chrome/browser/ui/cocoa/history_menu_bridge.mm ('K') | « chrome/browser/ui/webui/favicon_source.h ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.h » ('j') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/favicon_source.cc

diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc

index 6fa19b982547b19246e354b75f30310571128f2b..6945ac57a59eb9c56456a161e972e730996a367a 100644

--- a/chrome/browser/ui/webui/favicon_source.cc

+++ b/chrome/browser/ui/webui/favicon_source.cc

@@ -130,15 +130,16 @@ bool FaviconSource::ShouldReplaceExistingSource() const {

void FaviconSource::OnFaviconDataAvailable(

FaviconService::Handle request_handle,

- history::FaviconData favicon) {

+ history::FaviconData favicon_data,

+ std::vector<GURL> icon_urls_in_db) {

FaviconService* favicon_service =

profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);

int request_id = cancelable_consumer_.GetClientData(favicon_service,

request_handle);

- if (favicon.is_valid()) {

+ if (favicon_data.has_valid_bitmaps()) {

// Forward the data along to the networking system.

- SendResponse(request_id, favicon.image_data);

+ SendResponse(request_id, favicon_data.first_bitmap());

} else {

SendDefaultResponse(request_id);

}