Make the throbber and tab close button correctly respond to theme changes. T...

chrome/browser/views/tabs/tab.cc

 // Copyright (c) 2010 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/views/tabs/tab.h"
 
 #include <limits>
 
 #include "app/multi_animation.h"
 #include "app/resource_bundle.h"
@@ skipping 217 matching lines @@
 
 void Tab::Layout() {
   gfx::Rect lb = GetLocalBounds(false);
   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.
   int content_height = std::max(kFavIconSize, font_height());
-  content_height = std::max(content_height, close_button_height());
+  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_size =
         !data().favicon.empty() ? data().favicon.width() : kFavIconSize;
     int favicon_top = kTopPadding + content_height / 2 - favicon_size / 2;
     int favicon_left = lb.x();
     if (favicon_size != kFavIconSize) {
@@ skipping 16 matching lines @@
         favicon_bounds_.set_x(x);
       }
     }
   } else {
     favicon_bounds_.SetRect(lb.x(), lb.y(), 0, 0);
   }
 
   // Size the Close button.
   showing_close_button_ = ShouldShowCloseBox();
   if (showing_close_button_) {
-    int close_button_top =
-        kTopPadding + kCloseButtonVertFuzz +
-        (content_height - close_button_height()) / 2;
+    int close_button_top = kTopPadding + kCloseButtonVertFuzz +
+        (content_height - close_button_size.height()) / 2;
     // If the ratio of the close button size to tab width exceeds the maximum.
     close_button()->SetBounds(lb.width() + kCloseButtonHorzFuzz,
-                              close_button_top, close_button_width(),
-                              close_button_height());
+                              close_button_top, close_button_size.width(),
+                              close_button_size.height());
     close_button()->SetVisible(true);
   } else {
     close_button()->SetBounds(0, 0, 0, 0);
     close_button()->SetVisible(false);
   }
 
   int title_left = favicon_bounds_.right() + kFavIconTitleSpacing;
   int title_top = kTopPadding + (content_height - font_height()) / 2;
   // Size the Title text to fill the remaining space.
   if (!data().mini || width() >= kMiniTabRendererAsNormalTabWidth) {
@@ skipping 312 matching lines @@
   tab_active.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
   tab_active.l_width = tab_active.image_l->width();
   tab_active.r_width = tab_active.image_r->width();
 
   tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive.l_width = tab_inactive.image_l->width();
   tab_inactive.r_width = tab_inactive.image_r->width();
 }