Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1277)

Unified Diff: chrome/browser/ui/search_engines/template_url_table_model.cc

Issue 6651014: Applied the IconType. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addressed the comments Created 9 years, 9 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
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);
}
}

Powered by Google App Engine
This is Rietveld 408576698