fix position of close buttons in linux tabs

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.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/gtk/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/debug/trace_event.h"
@@ skipping 69 matching lines @@
 
 // Selected (but not active) tabs have their throb value scaled down by this.
 const double kSelectedTabThrobScale = 0.5;
 
 // Max opacity for the mini-tab title change animation.
 const double kMiniTitleChangeThrobOpacity = 0.75;
 
 // Duration for when the title of an inactive mini-tab changes.
 const int kMiniTitleChangeThrobDuration = 1000;
 
-// The vertical and horizontal offset used to position the close button
-// in the tab. TODO(jhawkins): Ask pkasting what the Fuzz is about.
-const int kCloseButtonVertFuzz = 0;
-const int kCloseButtonHorzFuzz = 5;
+// The horizontal offset used to position the close button in the tab.
+const int kCloseButtonHorzFuzz = 4;
 
 // Gets the bounds of |widget| relative to |parent|.
 gfx::Rect GetWidgetBoundsRelativeToParent(GtkWidget* parent,
                                           GtkWidget* widget) {
   gfx::Point parent_pos = ui::GetWidgetScreenPosition(parent);
   gfx::Point widget_pos = ui::GetWidgetScreenPosition(widget);
 
   GtkAllocation allocation;
   gtk_widget_get_allocation(widget, &allocation);
 
@@ skipping 633 matching lines @@
         favicon_bounds_.set_x(x);
       }
     }
   } else {
     favicon_bounds_.SetRect(local_bounds.x(), local_bounds.y(), 0, 0);
   }
 
   // Size the Close button.
   showing_close_button_ = ShouldShowCloseBox();
   if (showing_close_button_) {
-    int close_button_top =
-        kTopPadding + kCloseButtonVertFuzz +
+    int close_button_top = kTopPadding +
         (content_height - close_button_height_) / 2;
-    close_button_bounds_.SetRect(local_bounds.width() + kCloseButtonHorzFuzz,
-                                 close_button_top, close_button_width_,
+    int close_button_left =
+        local_bounds.right() - close_button_width_ + kCloseButtonHorzFuzz;
+    close_button_bounds_.SetRect(close_button_left,
+                                 close_button_top,
+                                 close_button_width_,
                                  close_button_height_);
 
     // If the close button color has changed, generate a new one.
     if (theme_service_) {
       SkColor tab_text_color =
-        theme_service_->GetColor(ThemeService::COLOR_TAB_TEXT);
+          theme_service_->GetColor(ThemeService::COLOR_TAB_TEXT);
       if (!close_button_color_ || tab_text_color != close_button_color_) {
         close_button_color_ = tab_text_color;
         ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
         close_button_->SetBackground(close_button_color_,
             rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),
             rb.GetImageNamed(IDR_TAB_CLOSE_MASK).AsBitmap());
       }
     }
   } else {
     close_button_bounds_.SetRect(0, 0, 0, 0);
@@ skipping 239 matching lines @@
 }
 
 bool TabRendererGtk::ShouldShowCloseBox() const {
   // The selected tab never clips close button.
   return !mini() && (IsActive() || IconCapacity() >= 3);
 }
 
 CustomDrawButton* TabRendererGtk::MakeCloseButton() {
   CustomDrawButton* button = new CustomDrawButton(IDR_TAB_CLOSE,
       IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE);
+  button->ForceChromeTheme();
 
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonClickedThunk), this);
   g_signal_connect(button->widget(), "button-release-event",
                    G_CALLBACK(OnCloseButtonMouseReleaseThunk), this);
   g_signal_connect(button->widget(), "enter-notify-event",
                    G_CALLBACK(OnEnterNotifyEventThunk), this);
   g_signal_connect(button->widget(), "leave-notify-event",
                    G_CALLBACK(OnLeaveNotifyEventThunk), this);
   gtk_widget_set_can_focus(button->widget(), FALSE);
@@ skipping 93 matching lines @@
   GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_TAB_CLOSE).ToGdkPixbuf();
   close_button_width_ = gdk_pixbuf_get_width(tab_close);
   close_button_height_ = gdk_pixbuf_get_height(tab_close);
 
   const gfx::Font& base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
   initialized_ = true;
 }