chrome/browser/ui/intents/web_intent_picker_controller.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/intents/web_intent_picker_controller.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/cocoa/history_menu_bridge.mm ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.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/intents/web_intent_picker_controller.cc

diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc

index b7ce59cef5c831a1bcc3c7f6b2acdfd074eab461..67f9ba6daafc85f6f9e479b2c2396215724c0b2b 100644

--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc

+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc

@@ -502,11 +502,12 @@ void WebIntentPickerController::AddServiceToModel(

pending_async_count_++;

FaviconService::Handle handle = favicon_service->GetFaviconImageForURL(

- tab_contents_->profile(),

- service.service_url,

- history::FAVICON,

- gfx::kFaviconSize,

- &favicon_consumer_,

+ FaviconService::FaviconForURLParams(

+ tab_contents_->profile(),

+ service.service_url,

+ history::FAVICON,

+ gfx::kFaviconSize,

+ &favicon_consumer_),

base::Bind(

&WebIntentPickerController::OnFaviconDataAvailable,

weak_ptr_factory_.GetWeakPtr()));