Fix tabs.cc static initializer issue.

chrome/browser/ui/views/tabs/tab.cc

 // Copyright (c) 2012 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/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 45 matching lines @@
 
 // Padding around the "content" of a tab, occupied by the tab border graphics.
 const int kLeftPadding = 22;
 const int kTopPadding = 7;
 const int kRightPadding = 17;
 const int kBottomPadding = 5;
 
 // Height of the shadow at the top of the tab image assets.
 const int kDropShadowHeight = 4;
 
-// Size of icon used for throbber and favicon next to tab title.
-const int kTabIconSize = gfx::kFaviconSize;
-
 // How long the pulse throb takes.
 const int kPulseDurationMs = 200;
 
 // Width of touch tabs.
 static const int kTouchWidth = 120;
 
 static const int kToolbarOverlap = 1;
 static const int kFaviconTitleSpacing = 4;
 // Additional vertical offset for title text relative to top of tab.
 // Ash text rendering may be different than Windows.
@@ skipping 602 matching lines @@
 }
 
 void Tab::Layout() {
   gfx::Rect lb = GetContentsBounds();
   if (lb.IsEmpty())
     return;
   lb.Inset(kLeftPadding, kTopPadding, kRightPadding, kBottomPadding);
 
   // The height of the content of the Tab is the largest of the favicon,
   // the title text and the close button graphic.
+  const int kTabIconSize = gfx::kFaviconSize;
   int content_height = std::max(kTabIconSize, font_height_);
   close_button_->SetBorder(views::Border::NullBorder());
   gfx::Size close_button_size(close_button_->GetPreferredSize());
   content_height = std::max(content_height, close_button_size.height());
 
   // Size the Favicon.
   showing_icon_ = ShouldShowIcon();
   if (showing_icon_) {
     // Use the size of the favicon as apps use a bigger favicon size.
     int favicon_top = kTopPadding + content_height / 2 - kTabIconSize / 2;
@@ skipping 762 matching lines @@
     SchedulePaintInRect(GetImmersiveBarRect());
   else
     ScheduleIconPaint();
 }
 
 int Tab::IconCapacity() const {
   if (height() < GetMinimumUnselectedSize().height())
     return 0;
   const int available_width =
       std::max(0, width() - kLeftPadding - kRightPadding);
-  const int width_per_icon = kTabIconSize;
+  const int width_per_icon = gfx::kFaviconSize;
   const int kPaddingBetweenIcons = 2;
   if (available_width >= width_per_icon &&
       available_width < (width_per_icon + kPaddingBetweenIcons)) {
     return 1;
   }
   return available_width / (width_per_icon + kPaddingBetweenIcons);
 }
 
 bool Tab::ShouldShowIcon() const {
   return chrome::ShouldTabShowFavicon(
@@ skipping 165 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }