Support touch icon in FaviconHelper

content/browser/tab_contents/tab_contents.h

Index: content/browser/tab_contents/tab_contents.h
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index aea147ea6ec17cf2742b9f60521f86c79f871c5b..a242b7dcf0ca071043886b9fa43102811bf8fa4a 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -883,6 +883,8 @@ class TabContents : public PageNavigator,
   virtual void RequestDesktopNotificationPermission(const GURL& source_origin,
                                                     int callback_context);
 
+  void OnUpdateFaviconURL(int32 page_id,
+                          const std::vector<FaviconURL>& candidates);
   // RenderViewHostManager::Delegate -------------------------------------------
 
   // Blocks/unblocks interaction with renderer process.
@@ -962,6 +964,10 @@ class TabContents : public PageNavigator,
   // Handles downloading favicons.
   scoped_ptr<FaviconHelper> favicon_helper_;
 
+  // Handles downloading touchicons. It is NULL if
+  // browser_defaults::kEnableTouchIcon is false.
+  scoped_ptr<FaviconHelper> touch_icon_helper_;
+
   // RenderViewHost::ContentSettingsDelegate.
   scoped_ptr<TabSpecificContentSettings> content_settings_delegate_;