Add baked-in favicons for default popular sites on NTP

components/ntp_tiles/popular_sites_impl.cc

 // Copyright 2015 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 "components/ntp_tiles/popular_sites_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/ntp_tiles/constants.h"
 #include "components/ntp_tiles/field_trial.h"
+#include "components/ntp_tiles/icon_cacher.h"
 #include "components/ntp_tiles/pref_names.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/search_engine_type.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/variations/service/variations_service.h"
 #include "components/variations/variations_associated_data.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
@@ skipping 264 matching lines @@
                                  std::string());
   user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverrideVersion,
                                  std::string());
 
   user_prefs->RegisterInt64Pref(kPopularSitesLastDownloadPref, 0);
   user_prefs->RegisterStringPref(kPopularSitesURLPref, std::string());
   user_prefs->RegisterListPref(kPopularSitesJsonPref,
                                DefaultPopularSites().release());
 }
 
+// static
+void PopularSitesImpl::AddIconsForDefaultPagesToCacher(const PrefService& prefs,
+                                                       IconCacher* cacher) {
+#if defined(OS_ANDROID) || defined(OS_IOS)
+  PopularSites::SitesVector sites =
+      ParseSiteList(*prefs.GetList(kPopularSitesJsonPref));
+  cacher->AddDefaultImage(sites[0], IDR_DEFAULT_POPULAR_SITES_ICON0);
+  cacher->AddDefaultImage(sites[1], IDR_DEFAULT_POPULAR_SITES_ICON1);
+  cacher->AddDefaultImage(sites[2], IDR_DEFAULT_POPULAR_SITES_ICON2);
+  cacher->AddDefaultImage(sites[3], IDR_DEFAULT_POPULAR_SITES_ICON3);
+  cacher->AddDefaultImage(sites[4], IDR_DEFAULT_POPULAR_SITES_ICON4);
+  cacher->AddDefaultImage(sites[5], IDR_DEFAULT_POPULAR_SITES_ICON5);
+  cacher->AddDefaultImage(sites[6], IDR_DEFAULT_POPULAR_SITES_ICON6);
+  cacher->AddDefaultImage(sites[7], IDR_DEFAULT_POPULAR_SITES_ICON7);
+#endif
+}
+
 void PopularSitesImpl::FetchPopularSites() {
   fetcher_ = URLFetcher::Create(pending_url_, URLFetcher::GET, this);
   data_use_measurement::DataUseUserData::AttachToFetcher(
       fetcher_.get(), data_use_measurement::DataUseUserData::NTP_TILES);
   fetcher_->SetRequestContext(download_context_);
   fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                          net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher_->SetAutomaticallyRetryOnNetworkChanges(1);
   fetcher_->Start();
 }
@@ skipping 46 matching lines @@
     pending_url_ = GetPopularSitesURL(kPopularSitesDefaultCountryCode,
                                       kPopularSitesDefaultVersion);
     FetchPopularSites();
   } else {
     DLOG(WARNING) << "Download fallback site list failed";
     callback_.Run(false);
   }
 }
 
 }  // namespace ntp_tiles