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

chrome/browser/ui/webui/ntp/favicon_webui_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/favicon_webui_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/color_analysis.h"
+#include "ui/gfx/favicon_size.h"
 
 namespace {
 
 StringValue* SkColorToCss(SkColor color) {
   return new StringValue(base::StringPrintf("rgb(%d, %d, %d)",
                                             SkColorGetR(color),
                                             SkColorGetG(color),
                                             SkColorGetB(color)));
 }
 
@@ skipping 66 matching lines @@
       StringValue dom_id_value(dom_id);
       scoped_ptr<StringValue> color(
           SkColorToCss(history::kPrepopulatedPages[i].color));
       web_ui()->CallJavascriptFunction("ntp.setStripeColor",
                                        dom_id_value, *color);
       return;
     }
   }
 
   dom_id_map_[id_] = dom_id;
-  FaviconService::Handle handle = favicon_service->GetFaviconForURL(
+  FaviconService::Handle handle = favicon_service->GetRawFaviconForURL(
       Profile::FromWebUI(web_ui()),
       url,
       history::FAVICON,
+      gfx::kFaviconSize,
+      ui::SCALE_FACTOR_100P,
       &consumer_,
       base::Bind(&FaviconWebUIHandler::OnFaviconDataAvailable,
                  base::Unretained(this)));
   consumer_.SetClientData(favicon_service, handle, id_++);
 }
 
 void FaviconWebUIHandler::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
-    history::FaviconData favicon) {
+    const history::FaviconBitmapResult& bitmap_result) {
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       Profile::FromWebUI(web_ui()), Profile::EXPLICIT_ACCESS);
   int id = consumer_.GetClientData(favicon_service, request_handle);
   scoped_ptr<StringValue> color_value;
 
-  if (favicon.is_valid())
-    color_value.reset(GetDominantColorCssString(favicon.image_data));
+  if (bitmap_result.is_valid())
+    color_value.reset(GetDominantColorCssString(bitmap_result.bitmap_data));
   else
     color_value.reset(new StringValue("#919191"));
 
   StringValue dom_id(dom_id_map_[id]);
   web_ui()->CallJavascriptFunction("ntp.setStripeColor", dom_id, *color_value);
   dom_id_map_.erase(id);
 }
 
 void FaviconWebUIHandler::HandleGetAppIconDominantColor(
     const ListValue* args) {
@@ skipping 15 matching lines @@
   std::vector<unsigned char> bits;
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &bits))
     return;
   scoped_refptr<base::RefCountedStaticMemory> bits_mem(
       new base::RefCountedStaticMemory(&bits.front(), bits.size()));
   scoped_ptr<StringValue> color_value(GetDominantColorCssString(bits_mem));
   StringValue id(extension_id);
   web_ui()->CallJavascriptFunction(
       "ntp.setStripeColor", id, *color_value);
 }