Convert GetPreferredSize from:...

chrome/browser/views/tabs/tab_renderer.cc

 // Copyright (c) 2006-2008 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 <limits>
 
 #include "chrome/browser/views/tabs/tab_renderer.h"
 
 #include "base/gfx/image_operations.h"
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 312 matching lines @@
   pulse_animation_->Reset();
   pulse_animation_->StartThrobbing(std::numeric_limits<int>::max());
 }
 
 void TabRenderer::StopPulse() {
   if (pulse_animation_->IsAnimating())
     pulse_animation_->Stop();
 }
 
 // static
-gfx::Size TabRenderer::GetMinimumSize() {
+gfx::Size TabRenderer::GetMinimumUnselectedSize() {
   InitResources();
 
   gfx::Size minimum_size;
   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_l->height());
   return minimum_size;
 }
 
 // static
 gfx::Size TabRenderer::GetMinimumSelectedSize() {
-  gfx::Size minimum_size = GetMinimumSize();
+  gfx::Size minimum_size = GetMinimumUnselectedSize();
   minimum_size.set_width(kLeftPadding + kFaviconSize + kRightPadding);
   return minimum_size;
 }
 
 // static
 gfx::Size TabRenderer::GetStandardSize() {
-  gfx::Size standard_size = GetMinimumSize();
+  gfx::Size standard_size = GetMinimumUnselectedSize();
   standard_size.set_width(
       standard_size.width() + kFavIconTitleSpacing + kStandardTitleWidth);
   return standard_size;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, protected:
 
 std::wstring TabRenderer::GetTitle() const {
   return data_.title;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, ChromeViews::View overrides:
 
 void TabRenderer::Paint(ChromeCanvas* canvas) {
   // Don't paint if we're narrower than we can render correctly. (This should
   // only happen during animations).
-  if (width() < GetMinimumSize().width())
+  if (width() < GetMinimumUnselectedSize().width())
     return;
 
   // See if the model changes whether the icons should be painted.
   const bool show_icon = ShouldShowIcon();
   const bool show_download_icon = data_.show_download_icon;
   const bool show_close_button = ShouldShowCloseBox();
   if (show_icon != showing_icon_ ||
       show_download_icon != showing_download_icon_ ||
       show_close_button != showing_close_button_)
     Layout();
@@ skipping 102 matching lines @@
     close_button_->SetVisible(false);
   }
 
   // Size the Title text to fill the remaining space.
   int title_left = favicon_bounds_.right() + kFavIconTitleSpacing;
   int title_top = kTopPadding + (content_height - title_font_height) / 2;
 
   // If the user has big fonts, the title will appear rendered too far down on
   // the y-axis if we use the regular top padding, so we need to adjust it so
   // that the text appears centered.
-  gfx::Size minimum_size = GetMinimumSize();
+  gfx::Size minimum_size = GetMinimumUnselectedSize();
   int text_height = title_top + title_font_height + kBottomPadding;
   if (text_height > minimum_size.height())
     title_top -= (text_height - minimum_size.height()) / 2;
 
   int title_width;
   if (close_button_->IsVisible()) {
     title_width = std::max(close_button_->x() -
                            kTitleCloseButtonSpacing - title_left, 0);
   } else {
     title_width = std::max(lb.Width() - title_left, 0);
@@ skipping 122 matching lines @@
     dst_x = width() - kLeftPadding - image_size;
   } else {
     dst_x = kLeftPadding;
   }
   canvas->DrawBitmapInt(*frames, image_offset, 0, image_size,
                         image_size, dst_x, dst_y, image_size, image_size,
                         false);
 }
 
 int TabRenderer::IconCapacity() const {
-  if (height() < GetMinimumSize().height()) {
+  if (height() < GetMinimumUnselectedSize().height())
     return 0;
-  }
   return (width() - kLeftPadding - kRightPadding) / kFaviconSize;
 }
 
 bool TabRenderer::ShouldShowIcon() const {
   if (!data_.show_icon) {
     return false;
   } else if (IsSelected()) {
     // The selected tab clips favicon before close button.
     return IconCapacity() >= 2;
   }
@@ skipping 32 matching lines @@
 }
 
 void TabRenderer::DisplayCrashedFavIcon() {
   should_display_crashed_favicon_ = true;
 }
 
 void TabRenderer::ResetCrashedFavIcon() {
   should_display_crashed_favicon_ = false;
 }