fav icon -> favicon. Pass 8: content/

chrome/browser/favicon_helper.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/favicon_helper.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
@@ skipping 124 matching lines @@
 
   entry->favicon().set_url(icon_url);
 
   if (got_favicon_from_history_)
     DownloadFaviconOrAskHistory(entry);
 }
 
 bool FaviconHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(FaviconHelper, message)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFavIconURL, OnUpdateFaviconURL)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_DidDownloadFavIcon, OnDidDownloadFavicon)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFaviconURL, OnUpdateFaviconURL)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_DidDownloadFavicon, OnDidDownloadFavicon)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void FaviconHelper::OnDidDownloadFavicon(int id,
                                          const GURL& image_url,
                                          bool errored,
                                          const SkBitmap& image) {
   DownloadRequests::iterator i = download_requests_.find(id);
@@ skipping 99 matching lines @@
     FaviconService::Handle handle,
     bool know_favicon,
     scoped_refptr<RefCountedMemory> data,
     bool expired,
     GURL icon_url) {
   NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   // No need to update the favicon url. By the time we get here
-  // UpdateFavIconURL will have set the favicon url.
+  // UpdateFaviconURL will have set the favicon url.
 
   if (know_favicon && data.get() && data->size()) {
     // There is a favicon, set it now. If expired we'll download the current
     // one again, but at least the user will get some icon instead of the
     // default and most likely the current one is fine anyway.
     UpdateFavicon(entry, data);
   }
 
   if (!know_favicon || expired) {
     // We don't know the favicon, or it is out of date. Request the current one.
     ScheduleDownload(entry->url(), entry->favicon().url(), kFaviconSize, NULL);
   }
 }
 
 int FaviconHelper::ScheduleDownload(const GURL& url,
                                     const GURL& image_url,
                                     int image_size,
                                     ImageDownloadCallback* callback) {
-  const int download_id = tab_contents()->render_view_host()->DownloadFavIcon(
+  const int download_id = tab_contents()->render_view_host()->DownloadFavicon(
       image_url, image_size);
 
   if (download_id) {
     // Download ids should be unique.
     DCHECK(download_requests_.find(download_id) == download_requests_.end());
     download_requests_[download_id] = DownloadRequest(url, image_url, callback);
   }
 
   return download_id;
 }
@@ skipping 11 matching lines @@
 }
 
 bool FaviconHelper::ShouldSaveFavicon(const GURL& url) {
   if (!profile()->IsOffTheRecord())
     return true;
 
   // Otherwise store the favicon if the page is bookmarked.
   BookmarkModel* bookmark_model = profile()->GetBookmarkModel();
   return bookmark_model && bookmark_model->IsBookmarked(url);
 }