Support touch icon in FaviconHelper

chrome/browser/ui/webui/most_visited_handler.cc

 // Copyright (c) 2011 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/most_visited_handler.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/md5.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "chrome/browser/ui/webui/thumbnail_source.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ skipping 21 matching lines @@
 
 MostVisitedHandler::~MostVisitedHandler() {
 }
 
 WebUIMessageHandler* MostVisitedHandler::Attach(WebUI* web_ui) {
   Profile* profile = web_ui->GetProfile();
   // Set up our sources for thumbnail and favicon data.
   ThumbnailSource* thumbnail_src = new ThumbnailSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(thumbnail_src);
 
-  FaviconSource* favicon_src = new FaviconSource(profile);
-  profile->GetChromeURLDataManager()->AddDataSource(favicon_src);
+  profile->GetChromeURLDataManager()->AddDataSource(new FaviconSource(profile));
 
   // Get notifications when history is cleared.
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
                  Source<Profile>(profile));
 
   WebUIMessageHandler* result = WebUIMessageHandler::Attach(web_ui);
 
   // We pre-emptively make a fetch for the most visited pages so we have the
   // results sooner.
   StartQueryForMostVisited();
@@ skipping 297 matching lines @@
 
 // static
 std::vector<GURL> MostVisitedHandler::GetPrePopulatedUrls() {
   const std::vector<MostVisitedPage> pages =
       MostVisitedHandler::GetPrePopulatedPages();
   std::vector<GURL> page_urls;
   for (size_t i = 0; i < pages.size(); ++i)
     page_urls.push_back(pages[i].url);
   return page_urls;
 }