Support touch icon in FaviconHelper

chrome/browser/ui/webui/favicon_source.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/favicon_source.h"
 
 #include "base/callback.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "grit/app_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
-FaviconSource::FaviconSource(Profile* profile)
-    : DataSource(chrome::kChromeUIFaviconHost, MessageLoop::current()),
-      profile_(profile->GetOriginalProfile()) {
+FaviconSource::FaviconSource(Profile* profile, const std::string& favicon_host)
+    : DataSource(favicon_host, MessageLoop::current()),
+      profile_(profile->GetOriginalProfile()),
+      icon_types_(favicon_host.compare(chrome::kChromeUIFaviconHost) == 0 ?
+          history::FAVICON :
+          history::TOUCH_PRECOMPOSED_ICON | history::TOUCH_ICON) {
 }
 
 FaviconSource::~FaviconSource() {
 }
 
 void FaviconSource::StartDataRequest(const std::string& path,
                                      bool is_off_the_record,
                                      int request_id) {
   FaviconService* favicon_service =
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   if (favicon_service) {
     FaviconService::Handle handle;
     if (path.empty()) {
       SendDefaultResponse(request_id);
       return;
     }
 
     if (path.size() > 8 && path.substr(0, 8) == "iconurl/") {
+      // TODO : Change GetFavicon to support combination of IconType.
       handle = favicon_service->GetFavicon(
           GURL(path.substr(8)),
           history::FAVICON,
           &cancelable_consumer_,
           NewCallback(this, &FaviconSource::OnFaviconDataAvailable));
     } else {
       handle = favicon_service->GetFaviconForURL(
           GURL(path),
-          history::FAVICON,
+          icon_types_,
           &cancelable_consumer_,
           NewCallback(this, &FaviconSource::OnFaviconDataAvailable));
     }
     // Attach the ChromeURLDataManager request ID to the history request.
     cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
   } else {
     SendResponse(request_id, NULL);
   }
 }
 
@@ skipping 27 matching lines @@
 
 void FaviconSource::SendDefaultResponse(int request_id) {
   if (!default_favicon_.get()) {
     default_favicon_ =
         ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
             IDR_DEFAULT_FAVICON);
   }
 
   SendResponse(request_id, default_favicon_);
 }