chrome/browser/ui/webui/extensions/extension_icon_source.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/webui/extensions/extension_icon_source.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/jumplist_win.h ('K') | « chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc ('k') | chrome/browser/ui/webui/extensions/extension_icon_source.cc » ('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/extensions/extension_icon_source.h

diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h

index 762069fcdf3475758d01d8e13beaf1bb1e87f3d1..25a2a907a9db1af486ad56471b83cd0be817b3f6 100644

--- a/chrome/browser/ui/webui/extensions/extension_icon_source.h

+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h

@@ -95,8 +95,9 @@ class ExtensionIconSource : public ChromeURLDataManager::DataSource,

void LoadFaviconImage(int request_id);

// FaviconService callback

- void OnFaviconDataAvailable(FaviconService::Handle request_handle,

- history::FaviconData favicon);

+ void OnFaviconDataAvailable(

+ FaviconService::Handle request_handle,

+ const history::FaviconBitmapResult& bitmap_result);

// ImageLoadingTracker::Observer

virtual void OnImageLoaded(const gfx::Image& image,