| Index: chrome/browser/ui/search_engines/template_url_table_model.cc
|
| diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
|
| index 280f386e47eb282443a1d4cc7a5d6a06a79dc28a..50dbcdb7cf7cfb85609c98c800b57669f8772dd3 100644
|
| --- a/chrome/browser/ui/search_engines/template_url_table_model.cc
|
| +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
|
| @@ -100,12 +100,16 @@ class ModelEntry {
|
|
|
| void OnFaviconDataAvailable(
|
| FaviconService::Handle handle,
|
| - history::FaviconData favicon) {
|
| + history::FaviconData favicon_data) {
|
| load_state_ = LOADED;
|
| - if (favicon.is_valid() && gfx::PNGCodec::Decode(favicon.image_data->front(),
|
| - favicon.image_data->size(),
|
| - &favicon_)) {
|
| - model_->FaviconAvailable(this);
|
| + if (favicon_data.is_valid()) {
|
| + const history::FaviconDataElement& element =
|
| + favicon_data.elements[0];
|
| + if (gfx::PNGCodec::Decode(element.bitmap_data->front(),
|
| + element.bitmap_data->size(),
|
| + &favicon_)) {
|
| + model_->FaviconAvailable(this);
|
| + }
|
| }
|
| }
|
|
|
|
|