[Icons NTP] Enable Large Icon URL storage and image fetching (Touch Icons only), behind flag.

components/favicon/core/browser/favicon_handler.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 COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_HANDLER_H_
 #define COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_HANDLER_H_
 
 #include <deque>
 #include <map>
 #include <vector>
@@ skipping 58 matching lines @@
 //
 // When the renderer downloads favicons, it considers the entire list of
 // favicon candidates, if |download_largest_favicon_| is true, the largest
 // favicon will be used, otherwise the one that best matches the preferred size
 // is chosen (or the first one if there is no preferred  size). Once the
 // matching favicon has been determined, SetFavicon is called which updates
 // the page's favicon and notifies the database to save the favicon.
 
 class FaviconHandler {
  public:
-  enum Type { FAVICON, TOUCH };
+  enum Type { FAVICON, TOUCH, LARGE };
 
   FaviconHandler(FaviconService* service,
                  FaviconClient* client,
                  FaviconDriver* driver,
-                 Type icon_type,
+                 Type handler_type,
                  bool download_largest_icon);
   virtual ~FaviconHandler();
 
+  // Returns the bit mask of favicon_base::IconType based on the handler's type.
+  static int GetIconTypesFromHandlerType(Type icon_type);

[sky, 2015/05/06 19:29:05]

Why is this public?

[huangs, 2015/05/06 19:59:14]

An oversight from my part.  Move to private?

[sky, 2015/05/06 20:13:54]

Yes please.

[huangs, 2015/05/06 20:33:55]

Acknowledged.

+
   // Initiates loading the favicon for the specified url.
   void FetchFavicon(const GURL& url);
 
   // Message Handler.  Must be public, because also called from
   // PrerenderContents. Collects the |image_urls| list.
   void OnUpdateFaviconURL(const std::vector<favicon::FaviconURL>& candidates);
 
-  // Processes the current image_irls_ entry, requesting the image from the
+  // Processes the current image_urls_ entry, requesting the image from the
   // history / download service.
   void ProcessCurrentUrl();
 
   // Message handler for ImageHostMsg_DidDownloadImage. Called when the image
   // at |image_url| has been downloaded.
   // |bitmaps| is a list of all the frames of the image at |image_url|.
   // |original_bitmap_sizes| are the sizes of |bitmaps| before they were resized
   // to the maximum bitmap size passed to DownloadFavicon().
   void OnDidDownloadFavicon(
       int id,
@@ skipping 132 matching lines @@
   }
 
   // Returns whether the page's url changed since the favicon was requested.
   bool PageChangedSinceFaviconWasRequested();
 
   // Returns the preferred size of the image. 0 means no preference (any size
   // will do).
   int preferred_icon_size() const {
     if (download_largest_icon_)
       return 0;
-    return icon_types_ == favicon_base::FAVICON ? gfx::kFaviconSize : 0;
+    return handler_type_ == FAVICON ? gfx::kFaviconSize : 0;
   }
 
   // Sorts the entries in |image_urls_| by icon size in descending order.
   // Additionally removes any entries whose sizes are all greater than the max
   // allowed size.
   void SortAndPruneImageUrls();
 
   // Used for FaviconService requests.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // URL of the page we're requesting the favicon for.
   GURL url_;
 
   // Whether we are waiting for data from the FaviconService.
   bool waiting_for_favicon_service_data_;
 
   // Whether we got data back for the initial request to the FaviconService.
   bool got_favicon_from_history_;
 
   // Whether the favicon is out of date or the favicon data in
   // |history_results_| is known to be incomplete. If true, it means history
   // knows about the favicon, but we need to download the favicon because the
   // icon has expired or the data in the database is incomplete.
   bool favicon_expired_or_incomplete_;
 
   // Requests to the renderer to download favicons.
   typedef std::map<int, DownloadRequest> DownloadRequests;
   DownloadRequests download_requests_;
 
+  // The type of the current handler.
+  const Type handler_type_;
+
   // The combination of the supported icon types.
   const int icon_types_;
 
   // Whether the largest icon should be downloaded.
   const bool download_largest_icon_;
 
   // The prioritized favicon candidates from the page back from the renderer.
   std::vector<favicon::FaviconURL> image_urls_;
 
   // The FaviconRawBitmapResults from history.
@@ skipping 12 matching lines @@
   // Best image we've seen so far.  As images are downloaded from the page they
   // are stored here. When there is an exact match, or no more images are
   // available the favicon service and the current page are updated (assuming
   // the image is for a favicon).
   FaviconCandidate best_favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_HANDLER_H_