summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/bookmark_utils_gtk.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 18:43:28 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 18:43:28 +0000
commitc7e082e2c8b24f56089b7b9fc465785dabae9ab1 (patch)
tree2c3a5c0fabd1a33283cf9d561c411c728b82ffb0 /chrome/browser/gtk/bookmark_utils_gtk.cc
parentc0e271526431ce0ea45f8a2fb47d19f6ca12858a (diff)
downloadchromium_src-c7e082e2c8b24f56089b7b9fc465785dabae9ab1.zip
chromium_src-c7e082e2c8b24f56089b7b9fc465785dabae9ab1.tar.gz
chromium_src-c7e082e2c8b24f56089b7b9fc465785dabae9ab1.tar.bz2
GTK Themes: Theme labels in LocationBarViewGtk.
Labels in LocationBarViewGtk should be black even when a dark GTK theme is used when we're not in GTK theme mode. Likewise, when we're using a GTK theme, we should have the background and border color of the "Search X for:" box use colors from the theme instead of having hard coded ones. Review URL: http://codereview.chromium.org/159798 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_utils_gtk.cc')
-rw-r--r--chrome/browser/gtk/bookmark_utils_gtk.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc
index 07e87ec..cf67b54 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/gtk/bookmark_utils_gtk.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/gtk/gtk_dnd_util.h"
#include "chrome/browser/gtk/gtk_theme_provider.h"
#include "chrome/browser/profile.h"
+#include "chrome/common/gtk_util.h"
#include "grit/app_resources.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -162,17 +163,11 @@ const BookmarkNode* BookmarkNodeForWidget(GtkWidget* widget) {
void SetButtonTextColors(GtkWidget* label, GtkThemeProvider* provider) {
if (provider->UseGtkTheme()) {
- gtk_widget_modify_fg(label, GTK_STATE_NORMAL, NULL);
- gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, NULL);
- gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, NULL);
- gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, NULL);
+ gtk_util::SetLabelColor(label, NULL);
} else {
GdkColor color = provider->GetGdkColor(
BrowserThemeProvider::COLOR_BOOKMARK_TEXT);
- gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &color);
- gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &color);
- gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &color);
- gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &color);
+ gtk_util::SetLabelColor(label, &color);
}
}