fav icon -> favicon. Pass 5: fav_icon -> favicon

chrome/browser/custom_home_pages_table_model.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/browser/custom_home_pages_table_model.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 
 struct CustomHomePagesTableModel::Entry {
-  Entry() : title_handle(0), fav_icon_handle(0) {}
+  Entry() : title_handle(0), favicon_handle(0) {}
 
   // URL of the page.
   GURL url;
 
   // Page title.  If this is empty, we'll display the URL as the entry.
   string16 title;
 
   // Icon for the page.
   SkBitmap icon;
 
   // If non-zero, indicates we're loading the title for the page.
   HistoryService::Handle title_handle;
 
   // If non-zero, indicates we're loading the favicon for the page.
-  FaviconService::Handle fav_icon_handle;
+  FaviconService::Handle favicon_handle;
 };
 
 CustomHomePagesTableModel::CustomHomePagesTableModel(Profile* profile)
     : default_favicon_(NULL),
       profile_(profile),
       observer_(NULL) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   default_favicon_ = rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
 }
 
@@ skipping 26 matching lines @@
   DCHECK(index >= 0 && index < RowCount());
   Entry* entry = &(entries_[index]);
   // Cancel any pending load requests now so we don't deref a bogus pointer when
   // we get the loaded notification.
   if (entry->title_handle) {
     HistoryService* history_service =
         profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
     if (history_service)
       history_service->CancelRequest(entry->title_handle);
   }
-  if (entry->fav_icon_handle) {
+  if (entry->favicon_handle) {
     FaviconService* favicon_service =
         profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
     if (favicon_service)
-      favicon_service->CancelRequest(entry->fav_icon_handle);
+      favicon_service->CancelRequest(entry->favicon_handle);
   }
   entries_.erase(entries_.begin() + static_cast<size_t>(index));
   if (observer_)
     observer_->OnItemsRemoved(index, 1);
 }
 
 void CustomHomePagesTableModel::SetToCurrentlyOpenPages() {
   // Remove the current entries.
   while (RowCount())
     Remove(0);
@@ skipping 52 matching lines @@
   HistoryService* history_service =
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (history_service) {
     entry->title_handle = history_service->QueryURL(entry->url, false,
         &query_consumer_,
         NewCallback(this, &CustomHomePagesTableModel::OnGotTitle));
   }
   FaviconService* favicon_service =
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   if (favicon_service) {
-    entry->fav_icon_handle = favicon_service->GetFaviconForURL(entry->url,
+    entry->favicon_handle = favicon_service->GetFaviconForURL(entry->url,
         &query_consumer_,
         NewCallback(this, &CustomHomePagesTableModel::OnGotFavIcon));
   }
 }
 
 void CustomHomePagesTableModel::OnGotTitle(HistoryService::Handle handle,
                                            bool found_url,
                                            const history::URLRow* row,
                                            history::VisitVector* visits) {
   int entry_index;
   Entry* entry =
       GetEntryByLoadHandle(&Entry::title_handle, handle, &entry_index);
   if (!entry) {
     // The URLs changed before we were called back.
     return;
   }
   entry->title_handle = 0;
   if (found_url && !row->title().empty()) {
     entry->title = row->title();
     if (observer_)
       observer_->OnItemsChanged(static_cast<int>(entry_index), 1);
   }
 }
 
 void CustomHomePagesTableModel::OnGotFavIcon(
     FaviconService::Handle handle,
-    bool know_fav_icon,
+    bool know_favicon,
     scoped_refptr<RefCountedMemory> image_data,
     bool is_expired,
     GURL icon_url) {
   int entry_index;
   Entry* entry =
-      GetEntryByLoadHandle(&Entry::fav_icon_handle, handle, &entry_index);
+      GetEntryByLoadHandle(&Entry::favicon_handle, handle, &entry_index);
   if (!entry) {
     // The URLs changed before we were called back.
     return;
   }
-  entry->fav_icon_handle = 0;
-  if (know_fav_icon && image_data.get() && image_data->size()) {
+  entry->favicon_handle = 0;
+  if (know_favicon && image_data.get() && image_data->size()) {
     int width, height;
     std::vector<unsigned char> decoded_data;
     if (gfx::PNGCodec::Decode(image_data->front(),
                               image_data->size(),
                               gfx::PNGCodec::FORMAT_BGRA, &decoded_data,
                               &width, &height)) {
       entry->icon.setConfig(SkBitmap::kARGB_8888_Config, width, height);
       entry->icon.allocPixels();
       memcpy(entry->icon.getPixels(), &decoded_data.front(),
              width * height * 4);
@@ skipping 17 matching lines @@
   return NULL;
 }
 
 string16 CustomHomePagesTableModel::FormattedURL(int row) const {
   std::string languages =
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
   string16 url = net::FormatUrl(entries_[row].url, languages);
   url = base::i18n::GetDisplayStringInLTRDirectionality(url);
   return url;
 }