Support touch icon in FaviconHelper

content/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 782 matching lines @@
                       bool page_translatable);
   void OnPageTranslated(int32 page_id,
                         const std::string& original_lang,
                         const std::string& translated_lang,
                         TranslateErrors::Type error_type);
   void OnSetSuggestions(int32 page_id,
                         const std::vector<std::string>& suggestions,
                         InstantCompleteBehavior behavior);
   void OnInstantSupportDetermined(int32 page_id, bool result);
 
+  void OnUpdateFaviconURL(int32 page_id,
+                          std::vector<FaviconURL> candidates);

[sky, 2011/03/22 19:48:48]

const&

[michaelbai, 2011/03/22 23:59:03]

Done.

+
   // Changes the IsLoading state and notifies delegate as needed
   // |details| is used to provide details on the load that just finished
   // (but can be null if not applicable). Can be overridden.
   void SetIsLoading(bool is_loading,
                     LoadNotificationDetails* details);
 
   // Adds the incoming |new_contents| to the |blocked_contents_| container.
   void AddPopup(TabContents* new_contents,
                 const gfx::Rect& initial_pos);
 
@@ skipping 262 matching lines @@
 
   // TabContentsSSLHelper, lazily created.
   scoped_ptr<TabContentsSSLHelper> ssl_helper_;
 
   // Handles drag and drop event forwarding to extensions.
   BookmarkDrag* bookmark_drag_;
 
   // Handles downloading favicons.
   scoped_ptr<FaviconHelper> favicon_helper_;
 
+  // Handles downloading touchicons.
+  scoped_ptr<FaviconHelper> touch_icon_helper_;

[sky, 2011/03/22 19:48:48]

Document may be NULL.

[michaelbai, 2011/03/22 23:59:03]

Done.

+
   // Cached web app info data.
   WebApplicationInfo web_app_info_;
 
   // Cached web app icon.
   SkBitmap app_icon_;
 
   // RenderViewHost::ContentSettingsDelegate.
   scoped_ptr<TabSpecificContentSettings> content_settings_delegate_;
 
   // Handles desktop notification IPCs.
@@ skipping 151 matching lines @@
   ObserverList<TabContentsObserver> observers_;
 
   // Content restrictions, used to disable print/copy etc based on content's
   // (full-page plugins for now only) permissions.
   int content_restrictions_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_