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

chrome/browser/ui/webui/favicon_source.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/favicon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "grit/locale_settings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/favicon_size.h"
 
 FaviconSource::FaviconSource(Profile* profile, IconType type)
     : DataSource(type == FAVICON ? chrome::kChromeUIFaviconHost :
                      chrome::kChromeUITouchIconHost,
                  MessageLoop::current()) {
   Init(profile, type);
 }
 
 FaviconSource::FaviconSource(Profile* profile,
                              IconType type,
@@ skipping 18 matching lines @@
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service || path.empty()) {
     SendDefaultResponse(request_id);
     return;
   }
 
   FaviconService::Handle handle;
   if (path.size() > 8 && path.substr(0, 8) == "iconurl/") {
     // TODO : Change GetFavicon to support combination of IconType.
-    handle = favicon_service->GetFavicon(
+    handle = favicon_service->GetRawFavicon(
         GURL(path.substr(8)),
         history::FAVICON,
+        gfx::kFaviconSize,
+        ui::SCALE_FACTOR_100P,
         &cancelable_consumer_,
         base::Bind(&FaviconSource::OnFaviconDataAvailable,
                    base::Unretained(this)));
   } else {
     GURL url;
 
     if (path.size() > 5 && path.substr(0, 5) == "size/") {
       size_t slash = path.find("/", 5);
       std::string size = path.substr(5, slash - 5);
       int pixel_size = atoi(size.c_str());
@@ skipping 29 matching lines @@
         request_size_map_.erase(request_id);
         SendResponse(request_id,
             ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
                 history::kPrepopulatedPages[i].favicon_id,
                 ui::SCALE_FACTOR_100P));
         return;
       }
     }
 
     // TODO(estade): fetch the requested size.
-    handle = favicon_service->GetFaviconForURL(
+    handle = favicon_service->GetRawFaviconForURL(
         profile_,
         url,
         icon_types_,
+        gfx::kFaviconSize,
+        ui::SCALE_FACTOR_100P,
         &cancelable_consumer_,
         base::Bind(&FaviconSource::OnFaviconDataAvailable,
                    base::Unretained(this)));
   }
 
   // Attach the ChromeURLDataManager request ID to the history request.
   cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
 }
 
 std::string FaviconSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 bool FaviconSource::ShouldReplaceExistingSource() const {
   // Leave the existing DataSource in place, otherwise we'll drop any pending
   // requests on the floor.
   return false;
 }
 
 void FaviconSource::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
-    history::FaviconData favicon) {
+    const history::FaviconBitmapResult& bitmap_result) {
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   int request_id = cancelable_consumer_.GetClientData(favicon_service,
                                                       request_handle);
 
-  if (favicon.is_valid()) {
+  if (bitmap_result.is_valid()) {
     // Forward the data along to the networking system.
-    SendResponse(request_id, favicon.image_data);
+    SendResponse(request_id, bitmap_result.bitmap_data);
   } else {
     SendDefaultResponse(request_id);
   }
 }
 
 void FaviconSource::SendDefaultResponse(int request_id) {
   base::RefCountedMemory* bytes = NULL;
   if (request_size_map_[request_id] == 32) {
     if (!default_favicon_large_.get()) {
       default_favicon_large_ =
           ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
               IDR_DEFAULT_LARGE_FAVICON, ui::SCALE_FACTOR_100P);
     }
     bytes = default_favicon_large_;
   } else {
     if (!default_favicon_.get()) {
       default_favicon_ =
           ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
               IDR_DEFAULT_FAVICON, ui::SCALE_FACTOR_100P);
     }
     bytes = default_favicon_;
   }
   request_size_map_.erase(request_id);
 
   SendResponse(request_id, bytes);
 }