wip

chrome/browser/ui/intents/web_intent_picker_controller.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/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 527 matching lines @@
   }
 
   CreatePicker();
   picker_->SetActionString(GetIntentActionString(
       UTF16ToUTF8(picker_model_->action())));
 }
 
 void WebIntentPickerController::OnFaviconDataAvailable(
     FaviconService::Handle handle, history::FaviconData favicon_data) {
   size_t index = favicon_consumer_.GetClientDataForCurrentRequest();
-  if (favicon_data.is_valid()) {
+  if (favicon_data.is_valid() && favicon_data.variants.size() > 0) {
     SkBitmap icon_bitmap;
 
-    if (gfx::PNGCodec::Decode(favicon_data.bitmap_data->front(),
-                              favicon_data.bitmap_data->size(),
+    if (gfx::PNGCodec::Decode(favicon_data.variants[0].bitmap_data->front(),
+                              favicon_data.variants[0].bitmap_data->size(),
                               &icon_bitmap)) {
       gfx::Image icon_image(icon_bitmap);
       picker_model_->UpdateFaviconAt(index, icon_image);
       return;
     }
   }
 
   AsyncOperationFinished();
 }
 
@@ skipping 146 matching lines @@
   // If picker is non-NULL, it was set by a test.
   if (picker_ == NULL)
     picker_ = WebIntentPicker::Create(tab_contents_, this, picker_model_.get());
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   if (picker_)
     picker_->Close();
 }