[Favicon] Add new fallback icon rendering flow.

chrome/browser/ui/webui/ntp/suggestions_page_handler.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/ui/webui/ntp/suggestions_page_handler.h"
 
 #include <math.h>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/md5.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/fallback_icon_source.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/ntp_stats.h"
 #include "chrome/browser/ui/webui/ntp/suggestions_combiner.h"
 #include "chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
 #include "chrome/common/url_constants.h"
 #include "components/history/core/browser/page_usage_data.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 26 matching lines @@
 
     UMA_HISTOGRAM_ENUMERATION("NewTabPage.SuggestedSitesAction", action_id,
                               NUM_NTP_FOLLOW_ACTIONS);
   }
 }
 
 void SuggestionsHandler::RegisterMessages() {
   Profile* profile = Profile::FromWebUI(web_ui());
   // Set up our sources for thumbnail and favicon data.
   content::URLDataSource::Add(profile, new ThumbnailSource(profile, false));
+  content::URLDataSource::Add(profile, new FallbackIconSource());

[pkotwicz, 2015/01/23 16:00:47]

I think that SuggestionsHandler is no longer used in Chrome because
NewTabUI::IsDiscoveryInNTPEnabled() always returns false. If this is the case,
please remove this change.

I have filed http://crbug.com/450679 about killing this class entirely.

[huangs, 2015/01/23 19:47:50]

Done.

   content::URLDataSource::Add(
       profile, new FaviconSource(profile, FaviconSource::FAVICON));
 
   // TODO(georgey) change the source of the web-sites to provide our data.
   // Initial commit uses top sites as a data source.
   history::TopSites* top_sites = profile->GetTopSites();
   if (top_sites) {
     // TopSites updates itself after a delay. This is especially noticable when
     // your profile is empty. Ask TopSites to update itself when we're about to
     // show the new tab page.
@@ skipping 113 matching lines @@
 
 std::string SuggestionsHandler::GetDictionaryKeyForURL(const std::string& url) {
   return base::MD5String(url);
 }
 
 // static
 void SuggestionsHandler::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   // TODO(georgey) add user preferences (such as own blacklist) as needed.
 }