wip

chrome/browser/ui/search_engines/template_url_table_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
@@ skipping 84 matching lines @@
     favicon_service->GetFavicon(favicon_url, history::FAVICON,
         &request_consumer_,
         base::Bind(&ModelEntry::OnFaviconDataAvailable,
                    base::Unretained(this)));
   }
 
   void OnFaviconDataAvailable(
       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);
     }
   }
 
   TemplateURL* template_url_;
   SkBitmap favicon_;
   LoadState load_state_;
   TemplateURLTableModel* model_;
   CancelableRequestConsumer request_consumer_;
 
@@ skipping 248 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       std::find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }