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

chrome/browser/ui/views/tabs/base_tab.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/ui/views/tabs/base_tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 126 matching lines @@
  private:
   BaseTab* target_;
 
   DISALLOW_COPY_AND_ASSIGN(FavIconCrashAnimation);
 };
 
 BaseTab::BaseTab(TabController* controller)
     : controller_(controller),
       closing_(false),
       dragging_(false),
-      fav_icon_hiding_offset_(0),
+      favicon_hiding_offset_(0),
       loading_animation_frame_(0),
       should_display_crashed_favicon_(false),
       throbber_disabled_(false),
       theme_provider_(NULL) {
   BaseTab::InitResources();
 
   SetID(VIEW_ID_TAB);
 
   // Add the Close Button.
   close_button_ = new TabCloseButton(this);
@@ skipping 274 matching lines @@
 
     int icon_size = frames.height();
     int image_offset = loading_animation_frame_ * icon_size;
     DrawIconCenter(canvas, frames, image_offset,
                    icon_size, icon_size, bounds, false);
   } else {
     canvas->Save();
     canvas->ClipRectInt(0, 0, width(), height());
     if (should_display_crashed_favicon_) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      SkBitmap crashed_fav_icon(*rb.GetBitmapNamed(IDR_SAD_FAVICON));
-      bounds.set_y(bounds.y() + fav_icon_hiding_offset_);
-      DrawIconCenter(canvas, crashed_fav_icon, 0,
-                     crashed_fav_icon.width(),
-                     crashed_fav_icon.height(), bounds, true);
+      SkBitmap crashed_favicon(*rb.GetBitmapNamed(IDR_SAD_FAVICON));
+      bounds.set_y(bounds.y() + favicon_hiding_offset_);
+      DrawIconCenter(canvas, crashed_favicon, 0,
+                     crashed_favicon.width(),
+                     crashed_favicon.height(), bounds, true);
     } else {
       if (!data().favicon.isNull()) {
         // TODO(pkasting): Use code in tab_icon_view.cc:PaintIcon() (or switch
         // to using that class to render the favicon).
         DrawIconCenter(canvas, data().favicon, 0,
                        data().favicon.width(),
                        data().favicon.height(),
                        bounds, true);
       }
     }
@@ skipping 50 matching lines @@
 }
 
 int BaseTab::loading_animation_frame() const {
   return loading_animation_frame_;
 }
 
 bool BaseTab::should_display_crashed_favicon() const {
   return should_display_crashed_favicon_;
 }
 
-int BaseTab::fav_icon_hiding_offset() const {
-  return fav_icon_hiding_offset_;
+int BaseTab::favicon_hiding_offset() const {
+  return favicon_hiding_offset_;
 }
 
 void BaseTab::SetFaviconHidingOffset(int offset) {
-  fav_icon_hiding_offset_ = offset;
+  favicon_hiding_offset_ = offset;
   ScheduleIconPaint();
 }
 
 void BaseTab::DisplayCrashedFavIcon() {
   should_display_crashed_favicon_ = true;
 }
 
 void BaseTab::ResetCrashedFavIcon() {
   should_display_crashed_favicon_ = false;
 }
@@ skipping 31 matching lines @@
 // static
 void BaseTab::InitResources() {
   static bool initialized = false;
   if (!initialized) {
     initialized = true;
     font_ = new gfx::Font(
         ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
     font_height_ = font_->GetHeight();
   }
 }