Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7337)

Unified Diff: chrome/common/gtk_util.cc

Issue 525016: Update RenderPreferences on GTK change. (Closed)
Patch Set: style nit Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/gtk_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/gtk_util.cc
diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc
index 5b078fbf569031b0d61165d418fbb6c91183859e..75a5acf617bf7f3d9f3311964ce8e031d1b1aeb6 100644
--- a/chrome/common/gtk_util.cc
+++ b/chrome/common/gtk_util.cc
@@ -440,8 +440,7 @@ GtkWidget* IndentWidget(GtkWidget* content) {
return content_alignment;
}
-void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs,
- bool use_gtk_theme) {
+void UpdateGtkFontSettings(RendererPreferences* prefs) {
DCHECK(prefs);
gint antialias = 0;
@@ -490,32 +489,6 @@ void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs,
}
}
- static GtkWidget* fixed = gtk_fixed_new();
- GtkStyle* style = gtk_rc_get_style(fixed);
- // base[SELECTED] seems more appropriate but in practice it is often too light
- // to be easily visible.
- GdkColor color = style->bg[GTK_STATE_SELECTED];
- prefs->focus_ring_color =
- SkColorSetRGB(color.red / 257, color.green / 257, color.blue / 257);
-
- GdkColor thumb_active_color, thumb_inactive_color, track_color;
- GtkThemeProvider::GetScrollbarColors(&thumb_active_color,
- &thumb_inactive_color,
- &track_color,
- use_gtk_theme);
- prefs->thumb_active_color =
- SkColorSetRGB(thumb_active_color.red / 257,
- thumb_active_color.green / 257,
- thumb_active_color.blue / 257);
- prefs->thumb_inactive_color =
- SkColorSetRGB(thumb_inactive_color.red / 257,
- thumb_inactive_color.green / 257,
- thumb_inactive_color.blue / 257);
- prefs->track_color =
- SkColorSetRGB(track_color.red / 257,
- track_color.green / 257,
- track_color.blue / 257);
-
if (hint_style)
g_free(hint_style);
if (rgba_style)
« no previous file with comments | « chrome/common/gtk_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698