GTK Themes: Use the correct text color in the tab strip.

chrome/browser/gtk/tabs/tab_strip_gtk.cc

 // Copyright (c) 2009 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/gtk/tabs/tab_strip_gtk.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_dnd_util.h"
+#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
 #if defined(LINUX2)
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 407 matching lines @@
 // TabStripGtk, public:
 
 TabStripGtk::TabStripGtk(TabStripModel* model)
     : current_unselected_width_(TabGtk::GetStandardSize().width()),
       current_selected_width_(TabGtk::GetStandardSize().width()),
       available_width_for_tabs_(-1),
       resize_layout_scheduled_(false),
       model_(model),
       resize_layout_factory_(this),
       added_as_message_loop_observer_(false) {
+  ThemeProvider* theme_provider = model->profile()->GetThemeProvider();
+  TabRendererGtk::SetSelectedTitleColor(theme_provider->GetColor(
+      BrowserThemeProvider::COLOR_TAB_TEXT));
+  TabRendererGtk::SetUnselectedTitleColor(theme_provider->GetColor(
+      BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT));
 }
 
 TabStripGtk::~TabStripGtk() {
   model_->RemoveObserver(this);
   tabstrip_.Destroy();
 
   // Free any remaining tabs.  This is needed to free the very last tab,
   // because it is not animated on close.  This also happens when all of the
   // tabs are closed at once.
   std::vector<TabData>::iterator iterator = tab_data_.begin();
@@ skipping 171 matching lines @@
     gtk_widget_translate_coordinates(
         gtk_widget_get_toplevel(widget()), target, 0, 0, &x, &y);
   }
   if (GTK_WIDGET_NO_WINDOW(target)) {
     x += target->allocation.x;
     y += target->allocation.y;
   }
   return gfx::Point(x, y);
 }
 
+void TabStripGtk::UserChangedTheme(GtkThemeProperties* properties) {
+  ThemeProvider* theme_provider = properties->provider;
+  TabRendererGtk::SetSelectedTitleColor(theme_provider->GetColor(
+      BrowserThemeProvider::COLOR_TAB_TEXT));
+  TabRendererGtk::SetUnselectedTitleColor(theme_provider->GetColor(
+      BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // TabStripGtk, TabStripModelObserver implementation:
 
 void TabStripGtk::TabInsertedAt(TabContents* contents,
                                 int index,
                                 bool foreground) {
   DCHECK(contents);
   DCHECK(index == TabStripModel::kNoTab || model_->ContainsIndex(index));
 
   if (active_animation_.get())
@@ skipping 958 matching lines @@
   message.set_type(TabOverviewTypes::Message::WM_SWITCH_TO_OVERVIEW_MODE);
   GtkWidget* browser_widget = GTK_WIDGET(
       static_cast<BrowserWindowGtk*>(browser->window())->GetNativeHandle());
   message.set_param(0, x11_util::GetX11WindowFromGtkWidget(browser_widget));
   TabOverviewTypes::instance()->SendMessage(message);
 
   UserMetrics::RecordAction(L"TabOverview_PressedTabOverviewButton",
                             tabstrip->model_->profile());
 }
 #endif