re-apply r34183...

chrome/common/gtk_util.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/gtk_util.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <cstdarg>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
+#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/common/renderer_preferences.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace {
 
 // Callback used in RemoveAllChildren.
 void RemoveWidget(GtkWidget* widget, gpointer container) {
   gtk_container_remove(GTK_CONTAINER(container), widget);
@@ skipping 385 matching lines @@
 }
 
 GtkWidget* IndentWidget(GtkWidget* content) {
   GtkWidget* content_alignment = gtk_alignment_new(0.0, 0.5, 1.0, 1.0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(content_alignment), 0, 0,
                             gtk_util::kGroupIndent, 0);
   gtk_container_add(GTK_CONTAINER(content_alignment), content);
   return content_alignment;
 }
 
-void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs) {
+void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs,
+                                      bool use_gtk_theme) {
   DCHECK(prefs);
 
   gint antialias = 0;
   gint hinting = 0;
   gchar* hint_style = NULL;
   gchar* rgba_style = NULL;
   g_object_get(gtk_settings_get_default(),
                "gtk-xft-antialias", &antialias,
                "gtk-xft-hinting", &hinting,
                "gtk-xft-hintstyle", &hint_style,
@@ skipping 36 matching lines @@
   }
 
   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)
     g_free(rgba_style);
 }
 
 gfx::Point ScreenPoint(GtkWidget* widget) {
   int x, y;
   gdk_display_get_pointer(gtk_widget_get_display(widget), NULL, &x, &y,
                           NULL);
@@ skipping 125 matching lines @@
   if (gtk_window_get_modal(GTK_WINDOW(dialog))) {
     // Work around a KDE 3 window manager bug.
     scoped_ptr<base::EnvironmentVariableGetter> env(
         base::EnvironmentVariableGetter::Create());
     if (base::DESKTOP_ENVIRONMENT_KDE3 == GetDesktopEnvironment(env.get()))
       gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE);
   }
 }
 
 }  // namespace gtk_util