diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 20:26:43 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 20:26:43 +0000 |
| commit | b5ac37f3cc4b85b8f7cee0b7ba61640b4a7673b5 (patch) | |
| tree | 8e2a9f96f9671cb92b9362f0954df0b44595c533 /chrome/common/gtk_util.cc | |
| parent | 37a649305d53e4be8862da1d84797d44655acd51 (diff) | |
| download | chromium_src-b5ac37f3cc4b85b8f7cee0b7ba61640b4a7673b5.zip chromium_src-b5ac37f3cc4b85b8f7cee0b7ba61640b4a7673b5.tar.gz chromium_src-b5ac37f3cc4b85b8f7cee0b7ba61640b4a7673b5.tar.bz2 | |
rollback r34183
tbr=asargent
Review URL: http://codereview.chromium.org/482002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/gtk_util.cc')
| -rw-r--r-- | chrome/common/gtk_util.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc index 5c9f870..c6c08e4 100644 --- a/chrome/common/gtk_util.cc +++ b/chrome/common/gtk_util.cc @@ -13,7 +13,6 @@ #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" @@ -419,8 +418,7 @@ GtkWidget* IndentWidget(GtkWidget* content) { return content_alignment; } -void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs, - bool use_gtk_theme) { +void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs) { DCHECK(prefs); gint antialias = 0; @@ -477,24 +475,6 @@ void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs, 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) |