chrome/browser/ui/cocoa/history_menu_bridge.h - 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/cocoa/history_menu_bridge.h

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/favicon/favicon_service.h ('K') | « chrome/browser/sync/glue/session_model_associator.cc ('k') | chrome/browser/ui/cocoa/history_menu_bridge.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/history_menu_bridge.h

diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h

index 3db83236873a125534b5a8d59e4fed053efe18a0..10a5cff551b8c64cf0be72f77727dfa60eb12bb9 100644

--- a/chrome/browser/ui/cocoa/history_menu_bridge.h

+++ b/chrome/browser/ui/cocoa/history_menu_bridge.h

@@ -190,8 +190,9 @@ class HistoryMenuBridge : public content::NotificationObserver,

// request it. This decodes the raw data, updates the HistoryItem, and then

// sets the image on the menu. Called on the same same thread that

// GetFaviconForHistoryItem() was called on (UI thread).

- void GotFaviconData(FaviconService::Handle handle,

- history::FaviconData favicon);

+ void GotFaviconData(

+ FaviconService::Handle handle,

+ const history::FaviconImageResult& image_result);

// Cancels a favicon load request for a given HistoryItem, if one is in

// progress.