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, 13 deletions

diff --git a/chrome/browser/ntp_background_util.cc b/chrome/browser/ntp_background_util.cc
index 5cd3f95..5dc0d6f 100644
--- a/chrome/browser/ntp_background_util.cc
+++ b/chrome/browser/ntp_background_util.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/browser/ntp_background_util.h"
 
 #include "base/logging.h"
-#include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/themes/theme_service.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/canvas.h"
@@ -22,26 +22,26 @@ void PaintThemeBackground(
   int width = area.width() + ntp_background->width();
   int height = area.height() + ntp_background->height();
 
-  if (alignment & BrowserThemeProvider::ALIGN_BOTTOM)
+  if (alignment & ThemeService::ALIGN_BOTTOM)
     y_pos += area.height() + tab_contents_height - ntp_background->height();
 
-  if (alignment & BrowserThemeProvider::ALIGN_RIGHT) {
+  if (alignment & ThemeService::ALIGN_RIGHT) {
     x_pos += area.width() - ntp_background->width();
-  } else if (alignment & BrowserThemeProvider::ALIGN_LEFT) {
+  } else if (alignment & ThemeService::ALIGN_LEFT) {
     // no op
   } else {  // ALIGN_CENTER
     x_pos += area.width() / 2 - ntp_background->width() / 2;
   }
 
-  if (tiling != BrowserThemeProvider::REPEAT &&
-      tiling != BrowserThemeProvider::REPEAT_X) {
+  if (tiling != ThemeService::REPEAT &&
+      tiling != ThemeService::REPEAT_X) {
     width = ntp_background->width();
   } else if (x_pos > 0) {
     x_pos = x_pos % ntp_background->width() - ntp_background->width();
   }
 
-  if (tiling != BrowserThemeProvider::REPEAT &&
-      tiling != BrowserThemeProvider::REPEAT_Y) {
+  if (tiling != ThemeService::REPEAT &&
+      tiling != ThemeService::REPEAT_Y) {
     height = ntp_background->height();
   } else if (y_pos > 0) {
     y_pos = y_pos % ntp_background->height() - ntp_background->height();
@@ -60,15 +60,15 @@ void NtpBackgroundUtil::PaintBackgroundDetachedMode(
     ui::ThemeProvider* tp, gfx::Canvas* canvas, const gfx::Rect& area,
     int tab_contents_height) {
   // Draw the background to match the new tab page.
-  canvas->FillRectInt(tp->GetColor(BrowserThemeProvider::COLOR_NTP_BACKGROUND),
+  canvas->FillRectInt(tp->GetColor(ThemeService::COLOR_NTP_BACKGROUND),
                       area.x(), area.y(), area.width(), area.height());
 
   if (tp->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
-    int tiling = BrowserThemeProvider::NO_REPEAT;
-    tp->GetDisplayProperty(BrowserThemeProvider::NTP_BACKGROUND_TILING,
+    int tiling = ThemeService::NO_REPEAT;
+    tp->GetDisplayProperty(ThemeService::NTP_BACKGROUND_TILING,
                            &tiling);
     int alignment;
-    if (tp->GetDisplayProperty(BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT,
+    if (tp->GetDisplayProperty(ThemeService::NTP_BACKGROUND_ALIGNMENT,
         &alignment)) {
       SkBitmap* ntp_background = tp->GetBitmapNamed(IDR_THEME_NTP_BACKGROUND);