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"
@@ skipping 112 matching lines @@
       continue;
     std::string favicon_url;
     item->GetString("favicon_url", &favicon_url);
     std::string thumbnail_url;
     item->GetString("thumbnail_url", &thumbnail_url);
     std::string large_icon_url;
     item->GetString("large_icon_url", &large_icon_url);
 
     sites.emplace_back(title, GURL(url), GURL(favicon_url),
                        GURL(large_icon_url), GURL(thumbnail_url));
+    item->GetInteger("default_resource_id", &sites.back().default_resource_id);
   }
   return sites;
 }
 
+#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_ANDROID) || defined(OS_IOS))
+void SetDefaultResourceForSite(base::ListValue* sites,
+                               int index,
+                               int resource_id) {
+  base::DictionaryValue* site;
+  if (!sites->GetDictionary(index, &site)) {
+    return;
+  }
+  site->SetInteger("default_resource_id", resource_id);
+}
+#endif
+
 // Creates the list of popular sites based on a snapshot available for mobile.
 std::unique_ptr<base::ListValue> DefaultPopularSites() {
 #if defined(OS_ANDROID) || defined(OS_IOS)
   std::unique_ptr<base::ListValue> sites =
       base::ListValue::From(base::JSONReader().ReadToValue(

[Marc Treib, 2017/02/27 12:41:49]

Just use the static Read() instead of creating a JSONReader instance?

[fhorschig, 2017/02/28 13:13:12]

Done.

           ResourceBundle::GetSharedInstance().GetRawDataResource(
               IDR_DEFAULT_POPULAR_SITES_JSON)));
+#if defined(GOOGLE_CHROME_BUILD)
   DCHECK(sites);

[Marc Treib, 2017/02/27 12:41:49]

Put this outside the #if ?

[fhorschig, 2017/02/28 13:13:12]

Done.

+  int index = 0;
+  for (int resource :
+       {IDR_DEFAULT_POPULAR_SITES_ICON0, IDR_DEFAULT_POPULAR_SITES_ICON1,
+        IDR_DEFAULT_POPULAR_SITES_ICON2, IDR_DEFAULT_POPULAR_SITES_ICON3,
+        IDR_DEFAULT_POPULAR_SITES_ICON4, IDR_DEFAULT_POPULAR_SITES_ICON5,
+        IDR_DEFAULT_POPULAR_SITES_ICON6, IDR_DEFAULT_POPULAR_SITES_ICON7}) {
+    SetDefaultResourceForSite(sites.get(), index++, resource);
+  }
+#endif  // GOOGLE_CHROME_BUILD
   return sites;
-#endif
+#endif  // OS_ANDROID || OS_IOS
   return base::MakeUnique<base::ListValue>();

[Marc Treib, 2017/02/27 12:41:49]

Should this be in an #else? Otherwise I'd expect "unreachable code" warnings.

[fhorschig, 2017/02/28 13:13:12]

It is now, but there haven't been warnings.

 }
 
 }  // namespace
 
 PopularSites::Site::Site(const base::string16& title,
                          const GURL& url,
                          const GURL& favicon_url,
                          const GURL& large_icon_url,
                          const GURL& thumbnail_url)
     : title(title),
       url(url),
       favicon_url(favicon_url),
       large_icon_url(large_icon_url),
-      thumbnail_url(thumbnail_url) {}
+      thumbnail_url(thumbnail_url),
+      default_resource_id(-1) {}
 
 PopularSites::Site::Site(const Site& other) = default;
 
 PopularSites::Site::~Site() {}
 
 PopularSitesImpl::PopularSitesImpl(
     const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
     PrefService* prefs,
     const TemplateURLService* template_url_service,
     VariationsService* variations_service,
@@ skipping 214 matching lines @@
     pending_url_ = GetPopularSitesURL(kPopularSitesDefaultCountryCode,
                                       kPopularSitesDefaultVersion);
     FetchPopularSites();
   } else {
     DLOG(WARNING) << "Download fallback site list failed";
     callback_.Run(false);
   }
 }
 
 }  // namespace ntp_tiles