summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 23:40:01 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 23:40:01 +0000
commitf49774a03a5ed71f3c3da9f29928a91a39723883 (patch)
treeb2da7126ba11ab3e21bf124ce71303b236601812
parent06cd6c0dc2dca02fa79d43746b9af206dd241d45 (diff)
downloadchromium_src-f49774a03a5ed71f3c3da9f29928a91a39723883.zip
chromium_src-f49774a03a5ed71f3c3da9f29928a91a39723883.tar.gz
chromium_src-f49774a03a5ed71f3c3da9f29928a91a39723883.tar.bz2
GTK: Fix label color and text color for DarkRoom.
BUG=none TEST=none Review URL: http://codereview.chromium.org/596046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38702 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/gtk_theme_provider.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 440720e..dbf01c1 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -451,7 +451,7 @@ void GtkThemeProvider::LoadGtkValues() {
GdkColor button_color = window_style->bg[GTK_STATE_SELECTED];
GtkStyle* label_style = gtk_rc_get_style(fake_label_.get());
- GdkColor label_color = label_style->text[GTK_STATE_NORMAL];
+ GdkColor label_color = label_style->fg[GTK_STATE_NORMAL];
GtkSettings* settings = gtk_settings_get_default();
bool theme_has_frame_color = false;
@@ -564,7 +564,7 @@ void GtkThemeProvider::LoadGtkValues() {
// Darklooks, HighContrastInverse or ThinIce.
GtkStyle* entry_style = gtk_rc_get_style(fake_entry_.get());
GdkColor ntp_background = entry_style->base[GTK_STATE_NORMAL];
- GdkColor ntp_foreground = entry_style->fg[GTK_STATE_NORMAL];
+ GdkColor ntp_foreground = entry_style->text[GTK_STATE_NORMAL];
SetThemeColorFromGtk(BrowserThemeProvider::COLOR_NTP_BACKGROUND,
&ntp_background);
SetThemeColorFromGtk(BrowserThemeProvider::COLOR_NTP_TEXT,