wip

chrome/browser/ui/toolbar/back_forward_menu_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 "build/build_config.h"
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 260 matching lines @@
 
     if (!entry)
       // The NavigationEntry wasn't found, this can happen if the user
       // navigates to another page and a NavigatationEntry falls out of the
       // range of kMaxHistoryItems.
       return;
 
     // Now that we have a valid NavigationEntry, decode the favicon and assign
     // it to the NavigationEntry.
     SkBitmap fav_icon;
-    if (gfx::PNGCodec::Decode(favicon.bitmap_data->front(),
-                              favicon.bitmap_data->size(),
+    if (favicon.variants.size() > 0 &&  // XXX
+        gfx::PNGCodec::Decode(favicon.variants[0].bitmap_data->front(),
+                              favicon.variants[0].bitmap_data->size(),
                               &fav_icon)) {
       entry->GetFavicon().valid = true;
       entry->GetFavicon().url = favicon.icon_url;
       if (fav_icon.empty())
         return;
       entry->GetFavicon().bitmap = fav_icon;
       if (menu_model_delegate()) {
         menu_model_delegate()->OnIconChanged(model_index);
       }
     }
@@ skipping 175 matching lines @@
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }