Applied the IconType.

chrome/browser/fav_icon_helper.cc

 // Copyright (c) 2010 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/fav_icon_helper.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
@@ skipping 34 matching lines @@
   cancelable_consumer_.CancelAllRequests();
 
   url_ = url;
 
   fav_icon_expired_ = got_fav_icon_from_history_ = got_fav_icon_url_ = false;
 
   // Request the favicon from the history service. In parallel to this the
   // renderer is going to notify us (well TabContents) when the favicon url is
   // available.
   if (GetFaviconService()) {
-    GetFaviconService()->GetFaviconForURL(url_, &cancelable_consumer_,
+    GetFaviconService()->GetFaviconForURL(url_, history::FAV_ICON,
+        &cancelable_consumer_,
         NewCallback(this, &FavIconHelper::OnFavIconDataForInitialURL));
   }
 }
 
 int FavIconHelper::DownloadImage(const GURL& image_url,
                                  int image_size,
                                  ImageDownloadCallback* callback) {
   DCHECK(callback);  // Must provide a callback.
   return ScheduleDownload(GURL(), image_url, image_size, callback);
 }
@@ skipping 10 matching lines @@
     const GURL& url,
     const GURL& image_url,
     const SkBitmap& image) {
   const SkBitmap& sized_image =
       (image.width() == kFavIconSize && image.height() == kFavIconSize)
       ? image : ConvertToFavIconSize(image);
 
   if (GetFaviconService() && ShouldSaveFavicon(url)) {
     std::vector<unsigned char> image_data;
     gfx::PNGCodec::EncodeBGRASkBitmap(sized_image, false, &image_data);
-    GetFaviconService()->SetFavicon(url, image_url, image_data);
+    GetFaviconService()->SetFavicon(url, image_url, image_data,
+                                    history::FAV_ICON);
   }
 
   if (url == url_) {
     NavigationEntry* entry = GetEntry();
     if (entry)
       UpdateFavIcon(entry, sized_image);
   }
 }
 
 void FavIconHelper::UpdateFavIcon(NavigationEntry* entry,
@@ skipping 78 matching lines @@
       tab_contents()->IsActiveEntry(entry->page_id())) {
     return entry;
   }
   // If the URL has changed out from under us (as will happen with redirects)
   // return NULL.
   return NULL;
 }
 
 void FavIconHelper::OnFavIconDataForInitialURL(
     FaviconService::Handle handle,
-    bool know_favicon,
-    scoped_refptr<RefCountedMemory> data,
-    bool expired,
-    GURL icon_url) {
+    history::FaviconData favicon) {
   NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   got_fav_icon_from_history_ = true;
 
-  fav_icon_expired_ = (know_favicon && expired);
+  fav_icon_expired_ = (favicon.known_icon && favicon.expired);
 
-  if (know_favicon && !entry->favicon().is_valid() &&
-      (!got_fav_icon_url_ || entry->favicon().url() == icon_url)) {
+  if (favicon.known_icon && !entry->favicon().is_valid() &&
+      (!got_fav_icon_url_ || entry->favicon().url() == favicon.icon_url)) {
     // The db knows the favicon (although it may be out of date) and the entry
     // doesn't have an icon. Set the favicon now, and if the favicon turns out
     // to be expired (or the wrong url) we'll fetch later on. This way the
     // user doesn't see a flash of the default favicon.
-    entry->favicon().set_url(icon_url);
-    if (data.get() && data->size())
-      UpdateFavIcon(entry, data);
+    entry->favicon().set_url(favicon.icon_url);
+    if (favicon.image_data.get() && favicon.image_data->size())

[sky, 2011/03/11 17:56:45]

is_valid

+      UpdateFavIcon(entry, favicon.image_data);
     entry->favicon().set_is_valid(true);
   }
 
-  if (know_favicon && !expired) {
-    if (got_fav_icon_url_ && entry->favicon().url() != icon_url) {
+  if (favicon.known_icon && !favicon.expired) {
+    if (got_fav_icon_url_ && entry->favicon().url() != favicon.icon_url) {
       // Mapping in the database is wrong. DownloadFavIconOrAskHistory will
       // update the mapping for this url and download the favicon if we don't
       // already have it.
       DownloadFavIconOrAskHistory(entry);
     }
   } else if (got_fav_icon_url_) {
     // We know the official url for the favicon, by either don't have the
     // favicon or its expired. Continue on to DownloadFavIconOrAskHistory to
     // either download or check history again.
     DownloadFavIconOrAskHistory(entry);
   }
   // else we haven't got the icon url. When we get it we'll ask the
   // renderer to download the icon.
 }
 
 void FavIconHelper::DownloadFavIconOrAskHistory(NavigationEntry* entry) {
   DCHECK(entry);  // We should only get here if entry is valid.
   if (fav_icon_expired_) {
     // We have the mapping, but the favicon is out of date. Download it now.
     ScheduleDownload(entry->url(), entry->favicon().url(), kFavIconSize, NULL);
   } else if (GetFaviconService()) {
     // We don't know the favicon, but we may have previously downloaded the
     // favicon for another page that shares the same favicon. Ask for the
     // favicon given the favicon URL.
     if (profile()->IsOffTheRecord()) {
       GetFaviconService()->GetFavicon(
           entry->favicon().url(),
+          history::FAV_ICON,
           &cancelable_consumer_,
           NewCallback(this, &FavIconHelper::OnFavIconData));
     } else {
       // Ask the history service for the icon. This does two things:
       // 1. Attempts to fetch the favicon data from the database.
       // 2. If the favicon exists in the database, this updates the database to
       //    include the mapping between the page url and the favicon url.
       // This is asynchronous. The history service will call back when done.
       // Issue the request and associate the current page ID with it.
       GetFaviconService()->UpdateFaviconMappingAndFetch(
           entry->url(),
-          entry->favicon().url(), &cancelable_consumer_,
+          entry->favicon().url(),
+          history::FAV_ICON,
+          &cancelable_consumer_,
           NewCallback(this, &FavIconHelper::OnFavIconData));
     }
   }
 }
 
 void FavIconHelper::OnFavIconData(
     FaviconService::Handle handle,
-    bool know_favicon,
-    scoped_refptr<RefCountedMemory> data,
-    bool expired,
-    GURL icon_url) {
+    history::FaviconData favicon) {
   NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   // No need to update the favicon url. By the time we get here
   // UpdateFavIconURL will have set the favicon url.
 
-  if (know_favicon && data.get() && data->size()) {
+  if (favicon.is_valid()) {
     // There is a favicon, set it now. If expired we'll download the current
     // one again, but at least the user will get some icon instead of the
     // default and most likely the current one is fine anyway.
-    UpdateFavIcon(entry, data);
+    UpdateFavIcon(entry, favicon.image_data);
   }
 
-  if (!know_favicon || expired) {
+  if (!favicon.known_icon || favicon.expired) {
     // We don't know the favicon, or it is out of date. Request the current one.
     ScheduleDownload(entry->url(), entry->favicon().url(), kFavIconSize, NULL);
   }
 }
 
 int FavIconHelper::ScheduleDownload(const GURL& url,
                                     const GURL& image_url,
                                     int image_size,
                                     ImageDownloadCallback* callback) {
   const int download_id = tab_contents()->render_view_host()->DownloadFavIcon(
@@ skipping 21 matching lines @@
 }
 
 bool FavIconHelper::ShouldSaveFavicon(const GURL& url) {
   if (!profile()->IsOffTheRecord())
     return true;
 
   // Otherwise store the favicon if the page is bookmarked.
   BookmarkModel* bookmark_model = profile()->GetBookmarkModel();
   return bookmark_model && bookmark_model->IsBookmarked(url);
 }