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

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

Issue 10821035: wip Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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 36bde048f831c1659783d714c51396126eb27bd0..6193b6a0da35a5559e541ba6c86237b81d3b851a 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -102,9 +102,10 @@ class ModelEntry {
FaviconService::Handle handle,
history::FaviconData favicon) {
load_state_ = LOADED;
- if (favicon.is_valid() && gfx::PNGCodec::Decode(favicon.bitmap_data->front(),
- favicon.bitmap_data->size(),
- &favicon_)) {
+ if (favicon.is_valid() && favicon.variants.size() > 0 &&
+ gfx::PNGCodec::Decode(favicon.variants[0].bitmap_data->front(),
+ favicon.variants[0].bitmap_data->size(),
+ &favicon_)) {
model_->FaviconAvailable(this);
}
}
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_controller.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698