chrome/browser/ui/webui/extensions/extension_icon_source.cc - Issue 10918065: Introduce structures to reduce the number of arguments in the FaviconService methods.

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

Issue 10918065: Introduce structures to reduce the number of arguments in the FaviconService methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove the auxiliary structure for non-URL cases. 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

« no previous file with comments | « chrome/browser/ui/toolbar/back_forward_menu_model.cc ('k') | chrome/browser/ui/webui/favicon_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.cc

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

index 72f6a1ec83ad0a104f73270fb788d3b1d74b882c..6e3e1b6e83d0dc72199c1541975dd2a2aff9db07 100644

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

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

@@ -215,12 +215,13 @@ void ExtensionIconSource::LoadFaviconImage(int request_id) {

GURL favicon_url = GetData(request_id)->extension->GetFullLaunchURL();

FaviconService::Handle handle = favicon_service->GetRawFaviconForURL(

- profile_,

- favicon_url,

- history::FAVICON,

- gfx::kFaviconSize,

+ FaviconService::FaviconForURLParams(

+ profile_,

+ favicon_url,

+ history::FAVICON,

+ gfx::kFaviconSize,

+ &cancelable_consumer_),

ui::SCALE_FACTOR_100P,

- &cancelable_consumer_,

base::Bind(&ExtensionIconSource::OnFaviconDataAvailable,

base::Unretained(this)));

cancelable_consumer_.SetClientData(favicon_service, handle, request_id);