Adds support for saving favicon size into history database.

chrome/browser/favicon/favicon_service.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/favicon/favicon_service.h"
 
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/url_constants.h"
+#include "ui/gfx/favicon_size.h"
 
 FaviconService::FaviconService(Profile* profile) : profile_(profile) {
 }
 
 FaviconService::Handle FaviconService::GetFavicon(
     const GURL& icon_url,
     history::IconType icon_type,
     CancelableRequestConsumerBase* consumer,
     const FaviconDataCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(callback);
   AddRequest(request, consumer);
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (hs)
-    hs->GetFavicon(request, icon_url, icon_type);
+    hs->GetFavicon(request, icon_url,
+                   gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize), icon_type);
   else
     ForwardEmptyResultAsync(request);
   return request->handle();
 }
 
 FaviconService::Handle FaviconService::UpdateFaviconMappingAndFetch(
     const GURL& page_url,
     const GURL& icon_url,
     history::IconType icon_type,
     CancelableRequestConsumerBase* consumer,
     const FaviconDataCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(callback);
   AddRequest(request, consumer);
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (hs)
-    hs->UpdateFaviconMappingAndFetch(request, page_url, icon_url, icon_type);
-  else
+  if (hs) {
+    gfx::Size default_icon_size =
+        gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
+    hs->UpdateFaviconMappingAndFetch(request, page_url, icon_url,
+                                     default_icon_size, icon_type);
+  } else {
     ForwardEmptyResultAsync(request);
+  }
   return request->handle();
 }
 
 FaviconService::Handle FaviconService::GetFaviconForURL(
     const GURL& page_url,
     int icon_types,
     CancelableRequestConsumerBase* consumer,
     const FaviconDataCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(callback);
   AddRequest(request, consumer);
   FaviconService::Handle handle = request->handle();
   if (page_url.SchemeIs(chrome::kChromeUIScheme) ||
       page_url.SchemeIs(chrome::kExtensionScheme)) {
     ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(
         profile_, request, page_url);
   } else {
     HistoryService* hs = HistoryServiceFactory::GetForProfile(
         profile_, Profile::EXPLICIT_ACCESS);
-    if (hs)
-      hs->GetFaviconForURL(request, page_url, icon_types);
-    else
+    if (hs) {
+      gfx::Size default_icon_size(gfx::kFaviconSize, gfx::kFaviconSize);
+      hs->GetFaviconForURL(request, page_url, default_icon_size, icon_types);
+    } else {
       ForwardEmptyResultAsync(request);
+    }
   }
   return handle;
 }
 
 // Requests the favicon for |favicon_id|. The |consumer| is notified when the
 // bits have been fetched.
 FaviconService::Handle FaviconService::GetFaviconForID(
     history::FaviconID favicon_id,
     CancelableRequestConsumerBase* consumer,
     const FaviconDataCallback& callback) {
@@ skipping 33 matching lines @@
   if (hs)
     hs->SetImportedFavicons(favicon_usage);
 }
 
 void FaviconService::SetFavicon(const GURL& page_url,
                                 const GURL& icon_url,
                                 const std::vector<unsigned char>& image_data,
                                 history::IconType icon_type) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (hs)
-    hs->SetFavicon(page_url, icon_url, image_data, icon_type);
+  if (hs) {
+    // This size should correspond to FaviconHandler::preferred_icon_size().
+    // TODO(pkotwicz): Fix this.
+    gfx::Size preferred_size = (icon_type == history::FAVICON) ?
+        gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize) : gfx::Size();
+    hs->SetFavicon(page_url, icon_url, image_data, preferred_size, icon_type);
+  }
 }
 
 FaviconService::~FaviconService() {
 }
 
 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) {
   request->ForwardResultAsync(request->handle(), history::FaviconData());
 }