Add support for new webkit capability allowing us to update

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1333 matching lines @@
   // Ignore all but top level navigations...
   if (!frame->parent()) {
     Send(new ViewHostMsg_UpdateTitle(
         routing_id_,
         page_id_,
         UTF16ToWideHack(title.length() > chrome::kMaxTitleChars ?
             title.substr(0, chrome::kMaxTitleChars) : title)));
   }
 }
 
+// Tell the embedding application that the icon of the active page has changed
+void RenderView::UpdateIconURL(WebFrame* frame, const GURL& icon_url) {

[brettw, 2010/04/26 23:28:33]

I would probably put this code in didChangeIcons and not add this extra
function. I suspect the title is split this way for historical reasons, where
the didReceiveTitle was added later for the WebKit API and then we just piped it
through to the old function.

+  // Ignore all but top level navigations...
+  if (!frame->parent()) {
+    Send(new ViewHostMsg_UpdateFavIconURL(

[brettw, 2010/04/26 23:28:33]

I'd just put this on the same line if I was you, but you can keep it this way if
you prefer.

+        routing_id_,
+        page_id_,
+        icon_url));
+  }
+}
+
 void RenderView::UpdateEncoding(WebFrame* frame,
                                 const std::string& encoding_name) {
   // Only update main frame's encoding_name.
   if (webview()->mainFrame() == frame &&
       last_encoding_name_ != encoding_name) {
     // Save the encoding name for later comparing.
     last_encoding_name_ = encoding_name;
 
     Send(new ViewHostMsg_UpdateEncoding(routing_id_, last_encoding_name_));
   }
@@ skipping 1292 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) {
+  UpdateIconURL(frame, frame->favIconURL());
+}
+
 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_));
 
   // The document has now been fully loaded.  Scan for forms to be sent up to
   // the browser.
@@ skipping 2287 matching lines @@
 
     if (last_top_level_navigation_page_id_ != page_id_ &&
         // Not interested in reloads.
         type != WebKit::WebNavigationTypeReload &&
         type != WebKit::WebNavigationTypeFormSubmitted) {
       return true;
     }
   }
   return false;
 }