Support touch icon in FaviconHelper

content/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1992 matching lines @@
     return;
   }
 
   is_loading_ = false;
 
   // NOTE: For now we're doing the safest thing, and sending out notification
   // when done loading. This currently isn't an issue as the favicon is only
   // displayed when done loading. Ideally we would send notification when
   // finished parsing the head, but webkit doesn't support that yet.
   // The feed discovery code would also benefit from access to the head.
+
+  // TODO : Get both favicon and touch icon url, and send them to the browser.
   GURL favicon_url(webview()->mainFrame()->favIconURL());
-  if (!favicon_url.is_empty())
-    Send(new ViewHostMsg_UpdateFaviconURL(routing_id_, page_id_, favicon_url));
+  if (!favicon_url.is_empty()) {
+    std::vector<FaviconURL> urls;
+    urls.push_back(FaviconURL(favicon_url, FAVICON));
+    Send(new ViewHostMsg_UpdateFaviconURL(routing_id_, page_id_, urls));
+  }
 
   AddGURLSearchProvider(webview()->mainFrame()->openSearchDescriptionURL(),
                         search_provider::AUTODETECTED_PROVIDER);
 
   Send(new ViewHostMsg_DidStopLoading(routing_id_));
 
   if (load_progress_tracker_ != NULL)
     load_progress_tracker_->DidStopLoading();
 
   MessageLoop::current()->PostDelayedTask(
@@ skipping 1114 matching lines @@
 
 void RenderView::didReceiveTitle(WebFrame* frame, const WebString& title) {
   UpdateTitle(frame, title);
 
   // Also check whether we have new encoding name.
   UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
 }
 
 void RenderView::didChangeIcons(WebFrame* frame) {
   if (!frame->parent()) {
-    Send(new ViewHostMsg_UpdateFaviconURL(
-        routing_id_,
-        page_id_,
-        frame->favIconURL()));
+    std::vector<FaviconURL> urls;
+    urls.push_back(FaviconURL(frame->favIconURL(), FAVICON));
+    Send(new ViewHostMsg_UpdateFaviconURL(routing_id_, page_id_, urls));
   }
 }
 
 void RenderView::didFinishDocumentLoad(WebFrame* frame) {
   WebDataSource* ds = frame->dataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
   DCHECK(navigation_state);
   navigation_state->set_finish_document_load_time(Time::Now());
 
   Send(new ViewHostMsg_DocumentLoadedInFrame(routing_id_, frame->identifier()));
@@ skipping 1913 matching lines @@
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }
 
 void RenderView::OnNetworkStateChanged(bool online) {
   WebNetworkStateNotifier::setOnLine(online);
 }