Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/ui/cocoa/history_menu_bridge.mm

 // 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/cocoa/history_menu_bridge.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/mac/nsimage_cache.h"
 
 namespace {
 
 // Menus more than this many chars long will get trimmed.
 const NSUInteger kMaximumMenuWidthInChars = 50;
 
 // When trimming, use this many chars from each side.
 const NSUInteger kMenuTrimSizeInChars = 25;
@@ skipping 403 matching lines @@
 
   // Tab navigations don't come with icons, so we always have to request them.
   GetFaviconForHistoryItem(item);
 
   return item;
 }
 
 void HistoryMenuBridge::GetFaviconForHistoryItem(HistoryItem* item) {
   FaviconService* service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  FaviconService::Handle handle = service->GetFaviconForURL(
-      profile_, item->url, history::FAVICON, &favicon_consumer_,
+  FaviconService::Handle handle = service->GetFaviconImageForURL(
+      profile_, item->url, history::FAVICON, gfx::kFaviconSize,
+      &favicon_consumer_,
       base::Bind(&HistoryMenuBridge::GotFaviconData, base::Unretained(this)));
   favicon_consumer_.SetClientData(service, handle, item);
   item->icon_handle = handle;
   item->icon_requested = true;
 }
 
-void HistoryMenuBridge::GotFaviconData(FaviconService::Handle handle,
-                                       history::FaviconData favicon) {
+void HistoryMenuBridge::GotFaviconData(
+    FaviconService::Handle handle,
+    const history::FaviconImageResult& image_result) {
   // Since we're going to do Cocoa-y things, make sure this is the main thread.
   DCHECK([NSThread isMainThread]);
 
   HistoryItem* item =
       favicon_consumer_.GetClientData(
           FaviconServiceFactory::GetForProfile(
               profile_, Profile::EXPLICIT_ACCESS), handle);
   DCHECK(item);
   item->icon_requested = false;
   item->icon_handle = 0;
 
-  // Convert the raw data to Skia and then to a NSImage.
-  // TODO(rsesek): Is there an easier way to do this?
-  SkBitmap icon;
-  if (favicon.is_valid() &&
-      gfx::PNGCodec::Decode(favicon.image_data->front(),
-          favicon.image_data->size(), &icon)) {
-    NSImage* image = gfx::SkBitmapToNSImage(icon);
-    if (image) {
-      // The conversion was successful.
-      item->icon.reset([image retain]);
-      [item->menu_item setImage:item->icon.get()];
-    }
+  NSImage* image = image_result.image.AsNSImage();
+  if (image) {
+    item->icon.reset([image retain]);
+    [item->menu_item setImage:item->icon.get()];
   }
 }
 
 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
   DCHECK(item);
   if (item->icon_requested) {
     FaviconService* service = FaviconServiceFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS);
     service->CancelRequest(item->icon_handle);
     item->icon_requested = false;
     item->icon_handle = 0;
   }
 }