chrome/browser/ui/intents/web_intent_picker_controller.cc - Issue 10802066: Adds support for saving favicon size into history database.

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 10802066: Adds support for saving favicon size into history database. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Changes as requested by Sky and stevenjb 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:

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 ee97269163040583756f867f7dec50b7065c605f..1830459cacf1e9dab91c732eefe5654e6d53497b 100644

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

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

@@ -590,8 +590,9 @@ void WebIntentPickerController::OnFaviconDataAvailable(

if (favicon_data.is_valid()) {

SkBitmap icon_bitmap;

- if (gfx::PNGCodec::Decode(favicon_data.image_data->front(),

- favicon_data.image_data->size(),

+ history::FaviconDataElement element = favicon_data.elements[0];

+ if (gfx::PNGCodec::Decode(element.bitmap_data->front(),

+ element.bitmap_data->size(),

&icon_bitmap)) {

gfx::Image icon_image(icon_bitmap);

picker_model_->UpdateFaviconAt(index, icon_image);