fav icon -> favicon. Pass 3: kFavIconSize -> kFaviconSize

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 432 matching lines @@
   minimum_size.set_width(kLeftPadding + kRightPadding);
   // Since we use bitmap images, the real minimum height of the image is
   // defined most accurately by the height of the end cap images.
   minimum_size.set_height(tab_active_.image_l->height() - kToolbarOverlap);
   return minimum_size;
 }
 
 // static
 gfx::Size TabRendererGtk::GetMinimumSelectedSize() {
   gfx::Size minimum_size = GetMinimumUnselectedSize();
-  minimum_size.set_width(kLeftPadding + kFavIconSize + kRightPadding);
+  minimum_size.set_width(kLeftPadding + kFaviconSize + kRightPadding);
   return minimum_size;
 }
 
 // static
 gfx::Size TabRendererGtk::GetStandardSize() {
   gfx::Size standard_size = GetMinimumUnselectedSize();
   standard_size.Enlarge(kFavIconTitleSpacing + kStandardTitleWidth, 0);
   return standard_size;
 }
 
 // static
 int TabRendererGtk::GetMiniWidth() {
   return browser_defaults::kMiniTabWidth;
 }
 
 // static
 int TabRendererGtk::GetContentHeight() {
   // The height of the content of the Tab is the largest of the favicon,
   // the title text and the close button graphic.
-  int content_height = std::max(kFavIconSize, title_font_height_);
+  int content_height = std::max(kFaviconSize, title_font_height_);
   return std::max(content_height, close_button_height_);
 }
 
 // static
 void TabRendererGtk::LoadTabImages() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   tab_alpha_.image_l = rb.GetBitmapNamed(IDR_TAB_ALPHA_LEFT);
   tab_alpha_.image_r = rb.GetBitmapNamed(IDR_TAB_ALPHA_RIGHT);
 
@@ skipping 180 matching lines @@
   if (local_bounds.IsEmpty())
     return;
   local_bounds.Inset(kLeftPadding, kTopPadding, kRightPadding, kBottomPadding);
 
   // Figure out who is tallest.
   int content_height = GetContentHeight();
 
   // Size the Favicon.
   showing_icon_ = ShouldShowIcon();
   if (showing_icon_) {
-    int favicon_top = kTopPadding + (content_height - kFavIconSize) / 2;
+    int favicon_top = kTopPadding + (content_height - kFaviconSize) / 2;
     favicon_bounds_.SetRect(local_bounds.x(), favicon_top,
-                            kFavIconSize, kFavIconSize);
+                            kFaviconSize, kFaviconSize);
     if ((mini() || data_.animating_mini_change) &&
         bounds_.width() < kMiniTabRendererAsNormalTabWidth) {
       int mini_delta = kMiniTabRendererAsNormalTabWidth - GetMiniWidth();
       int ideal_delta = bounds_.width() - GetMiniWidth();
       if (ideal_delta < mini_delta) {
-        int ideal_x = (GetMiniWidth() - kFavIconSize) / 2;
+        int ideal_x = (GetMiniWidth() - kFaviconSize) / 2;
         int x = favicon_bounds_.x() + static_cast<int>(
             (1 - static_cast<float>(ideal_delta) /
              static_cast<float>(mini_delta)) *
             (ideal_x - favicon_bounds_.x()));
         favicon_bounds_.set_x(x);
       }
     }
   } else {
     favicon_bounds_.SetRect(local_bounds.x(), local_bounds.y(), 0, 0);
   }
@@ skipping 133 matching lines @@
     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(),
                             favicon_bounds_.x(),
                             favicon_bounds_.y() + fav_icon_hiding_offset_,
-                            kFavIconSize, kFavIconSize,
+                            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_);
         } 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;
+              data_.favicon.width() - kFaviconSize : 0;
           int favIconHeightDelta = data_.app ?
-              data_.favicon.height() - kFavIconSize : 0;
+              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_,
-                                kFavIconSize + favIconWidthDelta,
-                                kFavIconSize + favIconHeightDelta,
+                                kFaviconSize + favIconWidthDelta,
+                                kFaviconSize + favIconHeightDelta,
                                 true);
         }
       }
     }
     canvas->Restore();
   }
 }
 
 void TabRendererGtk::PaintTabBackground(gfx::Canvas* canvas) {
   if (IsSelected()) {
@@ skipping 97 matching lines @@
       favicon_bounds_.x(), favicon_bounds_.y(), image_size, image_size);
   canvas->DrawBitmapInt(*frames, image_offset, 0, image_size, image_size,
       favicon_bounds_.x(), favicon_bounds_.y(), image_size, image_size,
       false);
   canvas->Restore();
 }
 
 int TabRendererGtk::IconCapacity() const {
   if (height() < GetMinimumUnselectedSize().height())
     return 0;
-  return (width() - kLeftPadding - kRightPadding) / kFavIconSize;
+  return (width() - kLeftPadding - kRightPadding) / kFaviconSize;
 }
 
 bool TabRendererGtk::ShouldShowCloseBox() const {
   // The selected tab never clips close button.
   return !mini() && (IsSelected() || IconCapacity() >= 3);
 }
 
 CustomDrawButton* TabRendererGtk::MakeCloseButton() {
   CustomDrawButton* button = new CustomDrawButton(IDR_TAB_CLOSE,
       IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE);
@@ skipping 87 matching lines @@
 
   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);
 
   initialized_ = true;
 }