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

chrome/browser/jumplist_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_JUMPLIST_WIN_H_
 #define CHROME_BROWSER_JUMPLIST_WIN_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 33 matching lines @@
 // need it.
 class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
  public:
   ShellLinkItem() : index_(0), favicon_(false) {
   }
 
   const std::wstring& arguments() const { return arguments_; }
   const std::wstring& title() const { return title_; }
   const std::wstring& icon() const { return icon_; }
   int index() const { return index_; }
-  scoped_refptr<base::RefCountedMemory> data() const { return data_; }
+  SkBitmap data() const { return data_; }

[sky, 2012/08/27 14:52:01]

const SkBitmap&

 
   void SetArguments(const std::wstring& arguments) {
     arguments_ = arguments;
   }
 
   void SetTitle(const std::wstring& title) {
     title_ = title;
   }
 
   void SetIcon(const std::wstring& icon, int index, bool favicon) {
     icon_ = icon;
     index_ = index;
     favicon_ = favicon;
   }
 
-  void SetIconData(scoped_refptr<base::RefCountedMemory> data) {
+  void SetIconData(const SkBitmap& data) {
     data_ = data;
   }
 
  private:
   friend class base::RefCountedThreadSafe<ShellLinkItem>;
 
   ~ShellLinkItem() {}
 
   std::wstring arguments_;
   std::wstring title_;
   std::wstring icon_;
-  scoped_refptr<base::RefCountedMemory> data_;
+  SkBitmap data_;
   int index_;
   bool favicon_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellLinkItem);
 };
 
 typedef std::vector<scoped_refptr<ShellLinkItem> > ShellLinkItemList;
 
 // A class which implements an application JumpList.
 // This class encapsulates operations required for updating an application
@@ skipping 76 matching lines @@
   // that retrieves a favicon for each URL in the list.
   void OnSegmentUsageAvailable(CancelableRequestProvider::Handle handle,
                                std::vector<PageUsageData*>* data);
 
   // A callback function for HistoryService that notify when a requested favicon
   // is available.
   // To avoid file operations, this function just attaches the given data to
   // a ShellLinkItem object.
   // When finishing loading all favicons, this function posts a task that
   // decompresses collected favicons and updates a JumpList.
-  void OnFaviconDataAvailable(HistoryService::Handle handle,
-                              history::FaviconData favicon);
+  void OnFaviconDataAvailable(
+      HistoryService::Handle handle,
+      const history::FaviconImageResult& image_result);
 
   // Callback for TopSites that notifies when the "Most
   // Visited" list is available. This function updates the ShellLinkItemList
   // objects and send another query that retrieves a favicon for each URL in
   // the list.
   void OnMostVisitedURLsAvailable(
       const history::MostVisitedURLList& data);
 
   // Runnable method that updates the jumplist, once all the data
   // has been fetched.
   void RunUpdate();
 
-  // Helper method for RunUpdate to decode the data about the asynchrounously
+  // Helper method for RunUpdate to create icon files for the asynchrounously
   // loaded icons.
-  void DecodeIconData(const ShellLinkItemList& item_list);
+  void CreateIconFiles(const ShellLinkItemList& item_list);
 
  private:
   friend class base::RefCountedThreadSafe<JumpList>;
   ~JumpList();
 
   // Our consumers for HistoryService.
   CancelableRequestConsumer most_visited_consumer_;
   CancelableRequestConsumer favicon_consumer_;
   CancelableRequestConsumer topsites_consumer_;
 
@@ skipping 25 matching lines @@
   // Handle of last favicon request used to cancel if a new request
   // comes in before the current one returns.
   FaviconService::Handle handle_;
 
   // Lock for most_visited_pages_, recently_closed_pages_, icon_urls_
   // as they may be used by up to 3 threads.
   base::Lock list_lock_;
 };
 
 #endif  // CHROME_BROWSER_JUMPLIST_WIN_H_