fav icon -> favicon. Pass 8: content/

chrome/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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1020 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
     IPC_MESSAGE_HANDLER(ViewMsg_SetContentSettingsForLoadingURL,
                         OnSetContentSettingsForLoadingURL)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevel, OnSetZoomLevel)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingURL,
                         OnSetZoomLevelForLoadingURL)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
     IPC_MESSAGE_HANDLER(ViewMsg_ResetPageEncodingToDefault,
                         OnResetPageEncodingToDefault)
     IPC_MESSAGE_HANDLER(ViewMsg_SetupDevToolsClient, OnSetupDevToolsClient)
-    IPC_MESSAGE_HANDLER(ViewMsg_DownloadFavIcon, OnDownloadFavIcon)
+    IPC_MESSAGE_HANDLER(ViewMsg_DownloadFavicon, OnDownloadFavicon)
     IPC_MESSAGE_HANDLER(ViewMsg_ScriptEvalRequest, OnScriptEvalRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_CSSInsertRequest, OnCSSInsertRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_AddMessageToConsole, OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ViewMsg_ReservePageIDRange, OnReservePageIDRange)
     IPC_MESSAGE_HANDLER(ViewMsg_DragTargetDragEnter, OnDragTargetDragEnter)
     IPC_MESSAGE_HANDLER(ViewMsg_DragTargetDragOver, OnDragTargetDragOver)
     IPC_MESSAGE_HANDLER(ViewMsg_DragTargetDragLeave, OnDragTargetDragLeave)
     IPC_MESSAGE_HANDLER(ViewMsg_DragTargetDrop, OnDragTargetDrop)
     IPC_MESSAGE_HANDLER(ViewMsg_AllowBindings, OnAllowBindings)
     IPC_MESSAGE_HANDLER(ViewMsg_SetWebUIProperty, OnSetWebUIProperty)
@@ skipping 1126 matching lines @@
 
   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.
   GURL favicon_url(webview()->mainFrame()->favIconURL());
   if (!favicon_url.is_empty())
-    Send(new ViewHostMsg_UpdateFavIconURL(routing_id_, page_id_, favicon_url));
+    Send(new ViewHostMsg_UpdateFaviconURL(routing_id_, page_id_, favicon_url));
 
   AddGURLSearchProvider(webview()->mainFrame()->openSearchDescriptionURL(),
                         ViewHostMsg_PageHasOSDD_Type::Autodetected());
 
   Send(new ViewHostMsg_DidStopLoading(routing_id_));
 
   if (load_progress_tracker_ != NULL)
     load_progress_tracker_->DidStopLoading();
 
   MessageLoop::current()->PostDelayedTask(
@@ skipping 1288 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(
+    Send(new ViewHostMsg_UpdateFaviconURL(
         routing_id_,
         page_id_,
         frame->favIconURL()));
   }
 }
 
 void RenderView::didFinishDocumentLoad(WebFrame* frame) {
   WebDataSource* ds = frame->dataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
   DCHECK(navigation_state);
@@ skipping 484 matching lines @@
   image_fetchers_.push_back(linked_ptr<ImageResourceFetcher>(
       new ImageResourceFetcher(
           image_url, webview()->mainFrame(), id, image_size,
           NewCallback(this, &RenderView::DidDownloadImage))));
   return true;
 }
 
 void RenderView::DidDownloadImage(ImageResourceFetcher* fetcher,
                                   const SkBitmap& image) {
   // Notify requester of image download status.
-  Send(new ViewHostMsg_DidDownloadFavIcon(routing_id_,
+  Send(new ViewHostMsg_DidDownloadFavicon(routing_id_,
                                           fetcher->id(),
                                           fetcher->image_url(),
                                           image.isNull(),
                                           image));
 
   // Remove the image fetcher from our pending list. We're in the callback from
   // ImageResourceFetcher, best to delay deletion.
   for (ImageResourceFetcherList::iterator iter = image_fetchers_.begin();
        iter != image_fetchers_.end(); ++iter) {
     if (iter->get() == fetcher) {
       iter->release();
       image_fetchers_.erase(iter);
       break;
     }
   }
   MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher);
 }
 
-void RenderView::OnDownloadFavIcon(int id,
+void RenderView::OnDownloadFavicon(int id,
                                    const GURL& image_url,
                                    int image_size) {
   bool data_image_failed = false;
   if (image_url.SchemeIs("data")) {
     SkBitmap data_image = ImageFromDataUrl(image_url);
     data_image_failed = data_image.empty();
     if (!data_image_failed) {
-      Send(new ViewHostMsg_DidDownloadFavIcon(routing_id_, id, image_url, false,
+      Send(new ViewHostMsg_DidDownloadFavicon(routing_id_, id, image_url, false,
                                               data_image));
     }
   }
 
   if (data_image_failed ||
       !DownloadImage(id, image_url, image_size)) {
-    Send(new ViewHostMsg_DidDownloadFavIcon(routing_id_, id, image_url, true,
+    Send(new ViewHostMsg_DidDownloadFavicon(routing_id_, id, image_url, true,
                                             SkBitmap()));
   }
 }
 
 SkBitmap RenderView::ImageFromDataUrl(const GURL& url) const {
   std::string mime_type, char_set, data;
   if (net::DataURL::Parse(url, &mime_type, &char_set, &data) && !data.empty()) {
     // Decode the favicon using WebKit's image decoder.
     webkit_glue::ImageDecoder decoder(gfx::Size(kFaviconSize, kFaviconSize));
     const unsigned char* src_data =
@@ skipping 1558 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);
 }