[Icons NTP] Working prototype to fetch, store, and display big icons.

chrome/browser/favicon/favicon_tab_helper.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_tab_helper.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/favicon/favicon_handler.h"
@@ skipping 36 matching lines @@
 #if defined(OS_ANDROID) || defined(OS_IOS)
   bool download_largest_icon = true;
 #else
   bool download_largest_icon = false;
 #endif
   favicon_handler_.reset(new FaviconHandler(
       client_, this, FaviconHandler::FAVICON, download_largest_icon));
   if (chrome::kEnableTouchIcon)
     touch_icon_handler_.reset(new FaviconHandler(
         client_, this, FaviconHandler::TOUCH, download_largest_icon));
+  big_icon_handler_.reset(

[Roger McFarlane (Chromium), 2015/03/16 19:00:59]

maybe put these derefs behind a check for null? So you can put the big icon
handling behind a flag?

[huangs, 2015/03/17 01:43:52]

Done.

+      new FaviconHandler(client_, this, FaviconHandler::BIG, true));
 }
 
 FaviconTabHelper::~FaviconTabHelper() {
 }
 
 void FaviconTabHelper::FetchFavicon(const GURL& url) {
   favicon_handler_->FetchFavicon(url);
   if (touch_icon_handler_.get())
     touch_icon_handler_->FetchFavicon(url);
+  big_icon_handler_->FetchFavicon(url);
 }
 
 gfx::Image FaviconTabHelper::GetFavicon() const {
   // Like GetTitle(), we also want to use the favicon for the last committed
   // entry rather than a pending navigation entry.
   const NavigationController& controller = web_contents()->GetController();
   NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
     return entry->GetFavicon().image;
 
@@ skipping 199 matching lines @@
   for (size_t i = 0; i < candidates.size(); i++) {
     const content::FaviconURL& candidate = candidates[i];
     favicon_urls.push_back(
         favicon::FaviconURL(candidate.icon_url,
                             ToChromeIconType(candidate.icon_type),
                             candidate.icon_sizes));
   }
   favicon_handler_->OnUpdateFaviconURL(favicon_urls);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnUpdateFaviconURL(favicon_urls);
+  big_icon_handler_->OnUpdateFaviconURL(favicon_urls);
 }
 
 void FaviconTabHelper::DidDownloadFavicon(
     int id,
     int http_status_code,
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
 
   if (bitmaps.empty() && http_status_code == 404) {
     DVLOG(1) << "Failed to Download Favicon:" << image_url;
     FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
         profile_->GetOriginalProfile(), ServiceAccessType::IMPLICIT_ACCESS);
     if (favicon_service)
       favicon_service->UnableToDownloadFavicon(image_url);
   }
 
   favicon_handler_->OnDidDownloadFavicon(
       id, image_url, bitmaps, original_bitmap_sizes);
   if (touch_icon_handler_.get()) {
     touch_icon_handler_->OnDidDownloadFavicon(
         id, image_url, bitmaps, original_bitmap_sizes);
   }
+  big_icon_handler_->OnDidDownloadFavicon(
+      id, image_url, bitmaps, original_bitmap_sizes);
 }