Theme system cleanup

- Removes useless dependencies on themeing from content/
- Renames BrowserThemeProvider to ThemeService, along with name variants such
  as GtkThemeService. BrowserThemeProvider has grown by a lot to be more than
  an implementation of the ui::ThemeProvider interface. This change touches
  everything.
- Rename theme_service.{h,cc} (which defined ThemeServiceFactory) to
  theme_service_factory.{h,cc}.

BUG=77155
TEST=compiles.

Review URL: http://codereview.chromium.org/6727005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79145 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 11 deletions

diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index e487b93..34ce27f 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/profiles/profile.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
@@ -18,18 +18,20 @@ void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) {
   gtk_util::UpdateGtkFontSettings(prefs);
 
 #if !defined(OS_CHROMEOS)
-  GtkThemeProvider* provider = GtkThemeProvider::GetFrom(profile);
-
-  prefs->focus_ring_color = provider->get_focus_ring_color();
-  prefs->thumb_active_color = provider->get_thumb_active_color();
-  prefs->thumb_inactive_color = provider->get_thumb_inactive_color();
-  prefs->track_color = provider->get_track_color();
-  prefs->active_selection_bg_color = provider->get_active_selection_bg_color();
-  prefs->active_selection_fg_color = provider->get_active_selection_fg_color();
+  GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
+
+  prefs->focus_ring_color = theme_service->get_focus_ring_color();
+  prefs->thumb_active_color = theme_service->get_thumb_active_color();
+  prefs->thumb_inactive_color = theme_service->get_thumb_inactive_color();
+  prefs->track_color = theme_service->get_track_color();
+  prefs->active_selection_bg_color =
+      theme_service->get_active_selection_bg_color();
+  prefs->active_selection_fg_color =
+      theme_service->get_active_selection_fg_color();
   prefs->inactive_selection_bg_color =
-      provider->get_inactive_selection_bg_color();
+      theme_service->get_inactive_selection_bg_color();
   prefs->inactive_selection_fg_color =
-      provider->get_inactive_selection_fg_color();
+      theme_service->get_inactive_selection_fg_color();
 #else
   prefs->focus_ring_color = SkColorSetRGB(0x50, 0x7A, 0xD5);
   prefs->active_selection_bg_color = SkColorSetRGB(0xDC, 0xE4, 0xFA);