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

chrome/browser/possible_url_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/possible_url_model.h"
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/cancelable_request.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/codec/png_codec.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 // The default favicon.
-SkBitmap* default_fav_icon = NULL;
+SkBitmap* default_favicon = NULL;
 
 // How long we query entry points for.
 const int kPossibleURLTimeScope = 30;
 
 }  // anonymous namespace
 
 // Contains the data needed to show a result.
 struct PossibleURLModel::Result {
   Result() : index(0) {}
 
   GURL url;
   // Index of this Result in results_. This is used as the key into
-  // fav_icon_map_ to lookup the favicon for the url, as well as the index
+  // favicon_map_ to lookup the favicon for the url, as well as the index
   // into results_ when the favicon is received.
   size_t index;
   ui::SortedDisplayURL display_url;
   std::wstring title;
 };
 
 
 PossibleURLModel::PossibleURLModel()
     : profile_(NULL),
       observer_(NULL) {
-  if (!default_fav_icon) {
+  if (!default_favicon) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    default_fav_icon = rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
+    default_favicon = rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
   }
 }
 
 PossibleURLModel::~PossibleURLModel() {
 }
 
 void PossibleURLModel::Reload(Profile *profile) {
   profile_ = profile;
   consumer_.CancelAllRequests();
   HistoryService* hs =
@@ skipping 25 matching lines @@
 
   // The old version of this code would filter out all but the most recent
   // visit to each host, plus all typed URLs and AUTO_BOOKMARK transitions. I
   // think this dialog has a lot of work, and I'm not sure those old
   // conditions are correct (the results look about equal quality for my
   // history with and without those conditions), so I'm not spending time
   // re-implementing them here. They used to be implemented in the history
   // service, but I think they should be implemented here because that was
   // pretty specific behavior that shouldn't be generally exposed.
 
-  fav_icon_map_.clear();
+  favicon_map_.clear();
   if (observer_)
     observer_->OnModelChanged();
 }
 
 int PossibleURLModel::RowCount() {
   return static_cast<int>(results_.size());
 }
 
 const GURL& PossibleURLModel::GetURL(int row) {
   if (row < 0 || row >= RowCount()) {
@@ skipping 28 matching lines @@
 
   // TODO(brettw): this should probably pass the GURL up so the URL elider
   // can be used at a higher level when we know the width.
   string16 url = results_[row].display_url.display_url();
   return base::i18n::GetDisplayStringInLTRDirectionality(url);
 }
 
 SkBitmap PossibleURLModel::GetIcon(int row) {
   if (row < 0 || row >= RowCount()) {
     NOTREACHED();
-    return *default_fav_icon;
+    return *default_favicon;
   }
 
   Result& result = results_[row];
-  FavIconMap::iterator i = fav_icon_map_.find(result.index);
-  if (i != fav_icon_map_.end()) {
+  FavIconMap::iterator i = favicon_map_.find(result.index);
+  if (i != favicon_map_.end()) {
     // We already requested the favicon, return it.
     if (!i->second.isNull())
       return i->second;
   } else if (profile_) {
     FaviconService* favicon_service =
         profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
     if (favicon_service) {
       CancelableRequestProvider::Handle h =
           favicon_service->GetFaviconForURL(
               result.url, &consumer_,
               NewCallback(this, &PossibleURLModel::OnFavIconAvailable));
       consumer_.SetClientData(favicon_service, h, result.index);
       // Add an entry to the map so that we don't attempt to request the
       // favicon again.
-      fav_icon_map_[result.index] = SkBitmap();
+      favicon_map_[result.index] = SkBitmap();
     }
   }
-  return *default_fav_icon;
+  return *default_favicon;
 }
 
 int PossibleURLModel::CompareValues(int row1, int row2, int column_id) {
   if (column_id == IDS_ASI_URL_COLUMN) {
     return results_[row1].display_url.Compare(
         results_[row2].display_url, GetCollator());
   }
   return ui::TableModel::CompareValues(row1, row2, column_id);
 }
 
 void PossibleURLModel::OnFavIconAvailable(
     FaviconService::Handle h,
-    bool fav_icon_available,
+    bool favicon_available,
     scoped_refptr<RefCountedMemory> data,
     bool expired,
     GURL icon_url) {
   if (profile_) {
     FaviconService* favicon_service =
         profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
     size_t index = consumer_.GetClientData(favicon_service, h);
-    if (fav_icon_available) {
+    if (favicon_available) {
       // The decoder will leave our bitmap empty on error.
       gfx::PNGCodec::Decode(data->front(), data->size(),
-                            &(fav_icon_map_[index]));
+                            &(favicon_map_[index]));
 
       // Notify the observer.
-      if (!fav_icon_map_[index].isNull() && observer_)
+      if (!favicon_map_[index].isNull() && observer_)
         observer_->OnItemsChanged(static_cast<int>(index), 1);
     }
   }
 }
 
 void PossibleURLModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }