chrome/browser/favicon/favicon_handler.h - Issue 10912088: favicon handler: Consider all frames when receiving favicons from the history db

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.h

Issue 10912088: favicon handler: Consider all frames when receiving favicons from the history db (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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/favicon/favicon_handler.h

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

index ec215f457888c13ad40ab5272fbfe68c44a6545d..721a49ab4091c03f2dd4b874317bc991b95d06e9 100644

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

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

@@ -242,7 +242,7 @@ class FaviconHandler {

// If the WebContents has a delegate, it is notified of the new favicon

// (INVALIDATE_FAVICON).

void UpdateFavicon(content::NavigationEntry* entry,

- scoped_refptr<base::RefCountedMemory> data);

+ const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results);

void UpdateFavicon(content::NavigationEntry* entry, const gfx::Image* image);

// If the image is not already at its preferred size, scales the image such

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