| 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 6c82c853686938fc972f8d4fdbc9a957f7792089..75b250e4d3fd1f972259b97d11adb935939efcb6 100644
|
| --- a/chrome/browser/ui/search_engines/template_url_table_model.cc
|
| +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
|
| @@ -91,20 +91,20 @@ class ModelEntry {
|
| return;
|
| }
|
| load_state_ = LOADING;
|
| - favicon_service->GetFavicon(fav_icon_url,
|
| - &request_consumer_,
|
| - NewCallback(this, &ModelEntry::OnFavIconDataAvailable));
|
| + favicon_service->GetFavicon(
|
| + fav_icon_url,
|
| + history::FAV_ICON,
|
| + &request_consumer_,
|
| + NewCallback(this, &ModelEntry::OnFavIconDataAvailable));
|
| }
|
|
|
| void OnFavIconDataAvailable(
|
| FaviconService::Handle handle,
|
| - bool know_favicon,
|
| - scoped_refptr<RefCountedMemory> data,
|
| - bool expired,
|
| - GURL icon_url) {
|
| + history::FaviconData favicon) {
|
| load_state_ = LOADED;
|
| - if (know_favicon && data.get() &&
|
| - gfx::PNGCodec::Decode(data->front(), data->size(), &fav_icon_)) {
|
| + if (favicon.is_valid() && gfx::PNGCodec::Decode(favicon.image_data->front(),
|
| + favicon.image_data->size(),
|
| + &fav_icon_)) {
|
| model_->FavIconAvailable(this);
|
| }
|
| }
|
|
|