summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 00:46:27 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 00:46:27 +0000
commit46dc96623dc704dc9c7c9f893fdb756a614dc9bc (patch)
tree74cfbf33ac823bcf902bab31bab7ad85b2234249 /chrome/browser/gtk
parentf3bb7dca224bdf0640d86ea9d3fbbf987e9ec92d (diff)
downloadchromium_src-46dc96623dc704dc9c7c9f893fdb756a614dc9bc.zip
chromium_src-46dc96623dc704dc9c7c9f893fdb756a614dc9bc.tar.gz
chromium_src-46dc96623dc704dc9c7c9f893fdb756a614dc9bc.tar.bz2
GTK Themes: Provide the correct inactive frame tint color.
Review URL: http://codereview.chromium.org/149435 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc1
-rw-r--r--chrome/browser/gtk/gtk_theme_provider.cc5
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index b32db90..7331f3d 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1122,7 +1122,6 @@ void BrowserWindowGtk::InitWidgets() {
}
void BrowserWindowGtk::SetBackgroundColor() {
- // TODO(tc): Handle active/inactive colors.
Profile* profile = browser()->profile();
ThemeProvider* theme_provider = profile->GetThemeProvider();
int frame_color_id;
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 7c3c032..c42a038 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -96,9 +96,8 @@ void GtkThemeProvider::LoadGtkValues() {
GtkStyle* style = gtk_rc_get_style(fake_window_);
SetThemeColorFromGtk(themes::kColorFrame, &style->bg[GTK_STATE_SELECTED]);
- SetThemeColorFromGtk(themes::kColorFrameInactive,
- &style->bg[GTK_STATE_INSENSITIVE]);
- // TODO(erg): Incognito images.
+ // Skip COLOR_FRAME_INACTIVE and the incognito colors, as they will be
+ // autogenerated from tints.
SetThemeColorFromGtk(themes::kColorToolbar,
&style->bg[GTK_STATE_NORMAL]);
SetThemeColorFromGtk(themes::kColorTabText,