From cf5c066147a04343ba66d09b62521415024faea8 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Tue, 21 Dec 2010 03:26:11 +0000 Subject: views/touch: Fix scrollbar colors. Use GTK+ theme colors when toolkit_views uses gtk. BUG=scrollbars in a toolkit_views or touchui build doesn't have colors. TEST=see bug Review URL: http://codereview.chromium.org/6059001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69800 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/renderer_preferences_util.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc index b7d2041..bfa0811 100644 --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc @@ -17,7 +17,7 @@ void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) { #if defined(TOOLKIT_USES_GTK) gtk_util::UpdateGtkFontSettings(prefs); -#if !defined(TOOLKIT_VIEWS) +#if !defined(OS_CHROMEOS) GtkThemeProvider* provider = GtkThemeProvider::GetFrom(profile); prefs->focus_ring_color = provider->get_focus_ring_color(); @@ -30,9 +30,7 @@ void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) { provider->get_inactive_selection_bg_color(); prefs->inactive_selection_fg_color = provider->get_inactive_selection_fg_color(); -#endif // !defined(TOOLKIT_VIEWS) - -#if defined(OS_CHROMEOS) +#else prefs->focus_ring_color = SkColorSetARGB(255, 229, 151, 0); prefs->active_selection_bg_color = SkColorSetRGB(0xDC, 0xE4, 0xFA); prefs->active_selection_fg_color = SK_ColorBLACK; -- cgit v1.1