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

chrome/browser/ui/webui/ntp/android/bookmarks_handler.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/webui/ntp/android/bookmarks_handler.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/color_analysis.h"
+#include "ui/gfx/favicon_size.h"
 
 using base::Int64ToString;
 using content::BrowserThread;
 
 namespace {
 
 static const char* kParentIdParam = "parent_id";
 static const char* kNodeIdParam = "node_id";
 
 // Parses a bookmark ID passed back from the NTP.  The IDs differ from the
@@ skipping 312 matching lines @@
   bool is_partner;
   if (args && !args->empty() && ParseNtpBookmarkId(args, &id, &is_partner)) {
     DCHECK(partner_bookmarks_shim_ != NULL);
     const BookmarkNode* node =
         partner_bookmarks_shim_->GetNodeByID(id, is_partner);
     if (!node)
       return;
 
     FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
         profile, Profile::EXPLICIT_ACCESS);
-    FaviconService::Handle handle = favicon_service->GetFaviconForURL(
+    FaviconService::Handle handle = favicon_service->GetRawFaviconForURL(
         profile,
         node->url(),
         history::FAVICON | history::TOUCH_ICON,
+        gfx::kFaviconSize,
+        ui::SCALE_FACTOR_100P,
         &cancelable_consumer_,
         base::Bind(&BookmarksHandler::OnShortcutFaviconDataAvailable,
                    base::Unretained(this)));
     cancelable_consumer_.SetClientData(favicon_service, handle, node);
   }
 }
 
 void BookmarksHandler::OnShortcutFaviconDataAvailable(
     FaviconService::Handle handle,
-    history::FaviconData favicon) {
+    const history::FaviconBitmapResult& bitmap_result) {
   SkColor color = SK_ColorWHITE;
   SkBitmap favicon_bitmap;
-  if (favicon.is_valid()) {
-    color = GetDominantColorForFavicon(favicon.image_data);
-    gfx::PNGCodec::Decode(favicon.image_data->front(),
-                          favicon.image_data->size(),
+  if (bitmap_result.is_valid()) {
+    color = GetDominantColorForFavicon(bitmap_result.bitmap_data);
+    gfx::PNGCodec::Decode(bitmap_result.bitmap_data->front(),
+                          bitmap_result.bitmap_data->size(),
                           &favicon_bitmap);
   }
 
   Profile* profile = Profile::FromBrowserContext(
       web_ui()->GetWebContents()->GetBrowserContext());
   const BookmarkNode* node = cancelable_consumer_.GetClientData(
       FaviconServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS),
       handle);
 
   TabAndroid* tab = TabAndroid::FromWebContents(
       web_ui()->GetWebContents());
   if (tab) {
     tab->AddShortcutToBookmark(node->url(), node->GetTitle(),
                                favicon_bitmap, SkColorGetR(color),
                                SkColorGetG(color), SkColorGetB(color));
   }
 }