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

chrome/browser/ui/search_engines/template_url_table_model.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/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image_skia.h"
 
 // Group IDs used by TemplateURLTableModel.
 static const int kMainGroupID = 0;
 static const int kOtherGroupID = 1;
 
 // ModelEntry ----------------------------------------------------
 
 // ModelEntry wraps a TemplateURL as returned from the TemplateURL.
 // ModelEntry also tracks state information about the URL.
@@ skipping 22 matching lines @@
       LoadFavicon();
     if (!favicon_.isNull())
       return favicon_;
     return *default_icon;
   }
 
   // Resets internal status so that the next time the icon is asked for its
   // fetched again. This should be invoked if the url is modified.
   void ResetIcon() {
     load_state_ = NOT_LOADED;
-    favicon_ = SkBitmap();
+    favicon_ = gfx::ImageSkia();
   }
 
  private:
   // State of the favicon.
   enum LoadState {
     NOT_LOADED,
     LOADING,
     LOADED
   };
 
   void LoadFavicon() {
     load_state_ = LOADED;
     FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
         model_->template_url_service()->profile(), Profile::EXPLICIT_ACCESS);
     if (!favicon_service)
       return;
     GURL favicon_url = template_url()->favicon_url();
     if (!favicon_url.is_valid()) {
       // The favicon url isn't always set. Guess at one here.
       if (template_url_->url_ref().IsValid()) {
         GURL url(template_url_->url());
         if (url.is_valid())
           favicon_url = TemplateURL::GenerateFaviconURL(url);
       }
       if (!favicon_url.is_valid())
         return;
     }
     load_state_ = LOADING;
-    favicon_service->GetFavicon(favicon_url, history::FAVICON,
-        &request_consumer_,
+    favicon_service->GetFaviconImage(favicon_url, history::FAVICON,
+        gfx::kFaviconSize, &request_consumer_,
         base::Bind(&ModelEntry::OnFaviconDataAvailable,
                    base::Unretained(this)));
   }
 
   void OnFaviconDataAvailable(
       FaviconService::Handle handle,
-      history::FaviconData favicon) {
+      const history::FaviconImageResult& image_result) {
     load_state_ = LOADED;
-    if (favicon.is_valid() && gfx::PNGCodec::Decode(favicon.image_data->front(),
-                                                    favicon.image_data->size(),
-                                                    &favicon_)) {
+    if (!image_result.image.IsEmpty()) {
+      favicon_ = image_result.image.AsImageSkia();
       model_->FaviconAvailable(this);
     }
   }
 
   TemplateURL* template_url_;
-  SkBitmap favicon_;
+  gfx::ImageSkia favicon_;
   LoadState load_state_;
   TemplateURLTableModel* model_;
   CancelableRequestConsumer request_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(ModelEntry);
 };
 
 // TemplateURLTableModel -----------------------------------------
 
 TemplateURLTableModel::TemplateURLTableModel(
@@ skipping 242 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       std::find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }