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

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.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/gtk/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/utf_string_conversions.h"
@@ skipping 59 matching lines @@
 
 const SkScalar kTabCapWidth = 15;
 const SkScalar kTabTopCurveWidth = 4;
 const SkScalar kTabBottomCurveWidth = 3;
 
 // The vertical and horizontal offset used to position the close button
 // in the tab. TODO(jhawkins): Ask pkasting what the Fuzz is about.
 const int kCloseButtonVertFuzz = 0;
 const int kCloseButtonHorzFuzz = 5;
 
-SkBitmap* crashed_fav_icon = NULL;
+SkBitmap* crashed_favicon = NULL;
 
 // Gets the bounds of |widget| relative to |parent|.
 gfx::Rect GetWidgetBoundsRelativeToParent(GtkWidget* parent,
                                           GtkWidget* widget) {
   gfx::Point parent_pos = gtk_util::GetWidgetScreenPosition(parent);
   gfx::Point widget_pos = gtk_util::GetWidgetScreenPosition(widget);
   return gfx::Rect(widget_pos.x() - parent_pos.x(),
                    widget_pos.y() - parent_pos.y(),
                    widget->allocation.width, widget->allocation.height);
 }
@@ skipping 151 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(FavIconCrashAnimation);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRendererGtk, public:
 
 TabRendererGtk::TabRendererGtk(ui::ThemeProvider* theme_provider)
     : showing_icon_(false),
       showing_close_button_(false),
-      fav_icon_hiding_offset_(0),
+      favicon_hiding_offset_(0),
       should_display_crashed_favicon_(false),
       loading_animation_(theme_provider),
       background_offset_x_(0),
       background_offset_y_(kInactiveTabBackgroundOffsetY),
       close_button_color_(0) {
   InitResources();
 
   tab_.Own(gtk_fixed_new());
   gtk_widget_set_app_paintable(tab_.get(), TRUE);
   g_signal_connect(tab_.get(), "expose-event",
@@ skipping 335 matching lines @@
   if (!crash_animation_.get())
     return;
   crash_animation_->Stop();
 }
 
 bool TabRendererGtk::IsPerformingCrashAnimation() const {
   return crash_animation_.get() && crash_animation_->is_animating();
 }
 
 void TabRendererGtk::SetFaviconHidingOffset(int offset) {
-  fav_icon_hiding_offset_ = offset;
+  favicon_hiding_offset_ = offset;
   SchedulePaint();
 }
 
 void TabRendererGtk::DisplayCrashedFavIcon() {
   should_display_crashed_favicon_ = true;
 }
 
 void TabRendererGtk::ResetCrashedFavIcon() {
   should_display_crashed_favicon_ = false;
 }
@@ skipping 202 matching lines @@
                         title_bounds_.width(), title_bounds_.height());
 }
 
 void TabRendererGtk::PaintIcon(gfx::Canvas* canvas) {
   if (loading_animation_.animation_state() != ANIMATION_NONE) {
     PaintLoadingAnimation(canvas);
   } else {
     canvas->Save();
     canvas->ClipRectInt(0, 0, width(), height() - kFavIconTitleSpacing);
     if (should_display_crashed_favicon_) {
-      canvas->DrawBitmapInt(*crashed_fav_icon, 0, 0,
-                            crashed_fav_icon->width(),
-                            crashed_fav_icon->height(),
+      canvas->DrawBitmapInt(*crashed_favicon, 0, 0,
+                            crashed_favicon->width(),
+                            crashed_favicon->height(),
                             favicon_bounds_.x(),
-                            favicon_bounds_.y() + fav_icon_hiding_offset_,
+                            favicon_bounds_.y() + favicon_hiding_offset_,
                             kFaviconSize, kFaviconSize,
                             true);
     } else {
       if (!data_.favicon.isNull()) {
         if (data_.is_default_favicon && theme_provider_->UseGtkTheme()) {
           GdkPixbuf* favicon = GtkThemeProvider::GetDefaultFavicon(true);
           canvas->AsCanvasSkia()->DrawGdkPixbuf(
               favicon, favicon_bounds_.x(),
-              favicon_bounds_.y() + fav_icon_hiding_offset_);
+              favicon_bounds_.y() + favicon_hiding_offset_);
         } else {
           // If the favicon is an app icon, it is allowed to be drawn slightly
           // larger than the standard favicon.
           int favIconHeightOffset = data_.app ? -2 : 0;
           int favIconWidthDelta = data_.app ?
               data_.favicon.width() - kFaviconSize : 0;
           int favIconHeightDelta = data_.app ?
               data_.favicon.height() - kFaviconSize : 0;
 
           // TODO(pkasting): Use code in tab_icon_view.cc:PaintIcon() (or switch
           // to using that class to render the favicon).
           canvas->DrawBitmapInt(data_.favicon, 0, 0,
                                 data_.favicon.width(),
                                 data_.favicon.height(),
                                 favicon_bounds_.x() - favIconWidthDelta/2,
                                 favicon_bounds_.y() + favIconHeightOffset
                                     - favIconHeightDelta/2
-                                    + fav_icon_hiding_offset_,
+                                    + favicon_hiding_offset_,
                                 kFaviconSize + favIconWidthDelta,
                                 kFaviconSize + favIconHeightDelta,
                                 true);
         }
       }
     }
     canvas->Restore();
   }
 }
 
@@ skipping 203 matching lines @@
   if (initialized_)
     return;
 
   LoadTabImages();
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
-  crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
+  crashed_favicon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }