Support touch icon in FaviconHelper

content/browser/tab_contents/tab_contents.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 "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 353 matching lines @@
     UMA_HISTOGRAM_TIMES("Tab.Close",
         base::TimeTicks::Now() - tab_close_start_time_);
   }
 
   FOR_EACH_OBSERVER(TabContentsObserver, observers_, TabContentsDestroyed());
 
   net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
 }
 
 void TabContents::AddObservers() {
-  favicon_helper_.reset(new FaviconHelper(this));
+  favicon_helper_.reset(new FaviconHelper(this, FaviconHelper::FAVICON));
+  if (browser_defaults::kEnableTouchIcon)
+    touch_icon_helper_.reset(new FaviconHelper(this, FaviconHelper::TOUCH));
   plugin_observer_.reset(new PluginObserver(this));
   safebrowsing_detection_host_.reset(new safe_browsing::ClientSideDetectionHost(
       this));
   net::NetworkChangeNotifier::AddOnlineStateObserver(this);
 }
 
 bool TabContents::OnMessageReceived(const IPC::Message& message) {
   ObserverListBase<TabContentsObserver>::Iterator it(observers_);
   TabContentsObserver* observer;
   while ((observer = it.GetNext()) != NULL)
@@ skipping 18 matching lines @@
     IPC_MESSAGE_HANDLER(ViewHostMsg_DocumentLoadedInFrame,
                         OnDocumentLoadedInFrame)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidFinishLoad, OnDidFinishLoad)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateContentRestrictions,
                         OnUpdateContentRestrictions)
     IPC_MESSAGE_HANDLER(ViewHostMsg_PDFHasUnsupportedFeature,
                         OnPDFHasUnsupportedFeature)
     IPC_MESSAGE_HANDLER(ViewHostMsg_GoToEntryAtOffset, OnGoToEntryAtOffset)
     IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents)
     IPC_MESSAGE_HANDLER(ViewHostMsg_PageTranslated, OnPageTranslated)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFaviconURL, OnUpdateFaviconURL)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   if (!message_is_ok) {
     UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_RVD"));
     GetRenderProcessHost()->ReceivedBadMessage();
   }
 
   return handled;
 }
@@ skipping 1104 matching lines @@
     // page.
     UpdateTargetURL(details.entry->page_id(), GURL());
   }
 
   // Allow the new page to set the title again.
   received_page_title_ = false;
 
   // Get the favicon, either from history or request it from the net.
   favicon_helper_->FetchFavicon(details.entry->url());
 
+  if (touch_icon_helper_.get())
+    touch_icon_helper_->FetchFavicon(details.entry->url());
+
   // Clear all page actions, blocked content notifications and browser actions
   // for this tab, unless this is an in-page navigation.
   if (!details.is_in_page) {
     // Close blocked popups.
     if (blocked_contents_) {
       AutoReset<bool> auto_reset(&dont_notify_render_view_, true);
       blocked_contents_->Destroy();
       blocked_contents_ = NULL;
     }
 
@@ skipping 851 matching lines @@
 
 void TabContents::RequestDesktopNotificationPermission(
     const GURL& source_origin, int callback_context) {
   DesktopNotificationService* service =
       profile()->GetDesktopNotificationService();
   service->RequestPermission(
       source_origin, GetRenderProcessHost()->id(),
       render_view_host()->routing_id(), callback_context, this);
 }
 
+void TabContents::OnUpdateFaviconURL(
+    int32 page_id,
+    const std::vector<FaviconURL>& candidates) {
+  favicon_helper().OnUpdateFaviconURL(page_id, candidates);
+  if (touch_icon_helper_.get())
+    touch_icon_helper_->OnUpdateFaviconURL(page_id, candidates);
+}
+
 void TabContents::BeforeUnloadFiredFromRenderManager(
     bool proceed,
     bool* proceed_to_fire_unload) {
   if (delegate())
     delegate()->BeforeUnloadFired(this, proceed, proceed_to_fire_unload);
 }
 
 void TabContents::DidStartLoadingFromRenderManager(
       RenderViewHost* render_view_host) {
   DidStartLoading();
@@ skipping 158 matching lines @@
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
   rwh_view->SetSize(view()->GetContainerSize());
 }
 
 void TabContents::OnOnlineStateChanged(bool online) {
   render_view_host()->Send(new ViewMsg_NetworkStateChanged(
       render_view_host()->routing_id(), online));
 }