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

chrome/browser/ui/views/tabs/side_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/side_tab.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "views/controls/button/image_button.h"
 
 namespace {
 const int kVerticalTabHeight = 27;
 const int kTitleCloseSpacing = 4;
 const SkScalar kRoundRectRadius = 4;
 const SkColor kTabBackgroundColor = SK_ColorWHITE;
 const SkColor kTextColor = SK_ColorBLACK;
 
 // Padding between the edge and the icon.
 const int kIconLeftPadding = 5;
 
 // Location the title starts at.
-const int kTitleX = kIconLeftPadding + kFavIconSize + 5;
+const int kTitleX = kIconLeftPadding + kFaviconSize + 5;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // SideTab, public:
 
 SideTab::SideTab(TabController* controller)
     : BaseTab(controller) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   close_button()->SetBackground(kTextColor,
                                 rb.GetBitmapNamed(IDR_TAB_CLOSE),
                                 rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK));
 }
 
 SideTab::~SideTab() {
 }
 
 // static
 int SideTab::GetPreferredHeight() {
   return 27;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SideTab, views::View overrides:
 
 void SideTab::Layout() {
   if (ShouldShowIcon()) {
-    int icon_y = (height() - kFavIconSize) / 2;
-    icon_bounds_.SetRect(kIconLeftPadding, icon_y, kFavIconSize, kFavIconSize);
+    int icon_y = (height() - kFaviconSize) / 2;
+    icon_bounds_.SetRect(kIconLeftPadding, icon_y, kFaviconSize, kFaviconSize);
   } else {
     icon_bounds_ = gfx::Rect();
   }
 
   gfx::Size ps = close_button()->GetPreferredSize();
   int close_y = (height() - ps.height()) / 2;
   close_button()->SetBounds(
       std::max(0, width() - ps.width() -
                (GetPreferredHeight() - ps.height()) / 2),
       close_y,
@@ skipping 39 matching lines @@
   return icon_bounds_;
 }
 
 bool SideTab::ShouldPaintHighlight() const {
   return IsSelected() || !controller();
 }
 
 bool SideTab::ShouldShowIcon() const {
   return data().mini || data().show_icon;
 }