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/metrics/histogram.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/desktop_notification_handler.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/external_protocol_handler.h"
+#include "chrome/browser/favicon_delegate.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/metrics/metric_event_duration_details.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/omnibox_search_hint.h"
@@ skipping 339 matching lines @@
   }
 
   FOR_EACH_OBSERVER(TabContentsObserver, observers_, TabContentsDestroyed());
 
   net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
 }
 
 void TabContents::AddObservers() {
   printing_.reset(new printing::PrintViewManager(this));
   print_preview_.reset(new printing::PrintPreviewMessageHandler(this));
-  favicon_helper_.reset(new FaviconHelper(this));
+  favicon_helper_.reset(new FaviconHelper(this, history::FAVICON,
+                                          new FaviconDelegate(this)));
+  touch_icon_helper_.reset(new FaviconHelper(this,

[sky, 2011/03/18 17:33:37]

You'll want to define a constant in chrome/browser/defaults and set it to true
only when needed.

[michaelbai, 2011/03/22 18:14:13]

Done.

+      history::TOUCH_ICON | history::TOUCH_PRECOMPOSED_ICON, NULL));
   autofill_manager_.reset(new AutofillManager(this));
   autocomplete_history_manager_.reset(new AutocompleteHistoryManager(this));
   desktop_notification_handler_.reset(
       new DesktopNotificationHandlerForTC(this, GetRenderProcessHost()));
   plugin_observer_.reset(new PluginObserver(this));
   safebrowsing_detection_host_.reset(new safe_browsing::ClientSideDetectionHost(
       this));
   net::NetworkChangeNotifier::AddOnlineStateObserver(this);
 }
 
@@ skipping 170 matching lines @@
   if (web_ui)
     return !web_ui->should_hide_url();
   return true;
 }
 
 SkBitmap TabContents::GetFavicon() const {
   // Like GetTitle(), we also want to use the favicon for the last committed
   // entry rather than a pending navigation entry.
   NavigationEntry* entry = controller_.GetTransientEntry();
   if (entry)
-    return entry->favicon().bitmap();
+    return entry->GetFavicon(history::FAVICON).bitmap();
 
   entry = controller_.GetLastCommittedEntry();
   if (entry)
-    return entry->favicon().bitmap();
+    return entry->GetFavicon(history::FAVICON).bitmap();
   return SkBitmap();
 }
 
 bool TabContents::FaviconIsValid() const {
   NavigationEntry* entry = controller_.GetTransientEntry();
   if (entry)
-    return entry->favicon().is_valid();
+    return entry->GetFavicon(history::FAVICON).is_valid();
 
   entry = controller_.GetLastCommittedEntry();
   if (entry)
-    return entry->favicon().is_valid();
+    return entry->GetFavicon(history::FAVICON).is_valid();
 
   return false;
 }
 
 bool TabContents::ShouldDisplayFavicon() {
   // Always display a throbber during pending loads.
   if (controller_.GetLastCommittedEntry() && controller_.pending_entry())
     return true;
 
   WebUI* web_ui = GetWebUIForCurrentState();
@@ skipping 223 matching lines @@
   HistoryService* history = profile()->GetOriginalProfile()->GetHistoryService(
       Profile::IMPLICIT_ACCESS);
   if (!history)
     return;
   history->AddPageNoVisitForBookmark(entry->url());
 
   FaviconService* service = profile()->GetOriginalProfile()->GetFaviconService(
       Profile::IMPLICIT_ACCESS);
   if (!service)
     return;
-  const NavigationEntry::FaviconStatus& favicon(entry->favicon());
+  const NavigationEntry::FaviconStatus& favicon(
+      entry->GetFavicon(history::FAVICON));
   if (!favicon.is_valid() || favicon.url().is_empty() ||
       favicon.bitmap().empty()) {
     return;
   }
   std::vector<unsigned char> image_data;
   gfx::PNGCodec::EncodeBGRASkBitmap(favicon.bitmap(), false, &image_data);
   service->SetFavicon(
       entry->url(), favicon.url(), image_data, history::FAVICON);
 }
 
@@ skipping 808 matching lines @@
     // clicking on a link); see bugs 1184641 and 980803. We don't want to
     // clear the bubble when a user navigates to a named anchor in the same
     // 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());
+  favicon_helper_->FetchFavicon(details.entry->url(), history::FAVICON);
+
+  // We might totally disable fetching touch icon by using
+  // '#if define(SUPPORT_TOUCH_ICON)'
+  touch_icon_helper_->FetchFavicon(details.entry->url(),
+      history::TOUCH_ICON | history::TOUCH_PRECOMPOSED_ICON);
 
   // 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) {
     ExtensionService* service = profile()->GetExtensionService();
     if (service) {
       for (size_t i = 0; i < service->extensions()->size(); ++i) {
         ExtensionAction* browser_action =
             service->extensions()->at(i)->browser_action();
         if (browser_action) {
@@ skipping 1136 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));
 }