Add custom default theme support and create a managed user default theme.

chrome/browser/ui/gtk/gtk_theme_service.cc

Index: chrome/browser/ui/gtk/gtk_theme_service.cc
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc
index 53378609ccdd332607c100d01bc87f7cac4f0fdf..3942a4fbc31c04ed0037cb2e878896c0b220589c 100644
--- a/chrome/browser/ui/gtk/gtk_theme_service.cc
+++ b/chrome/browser/ui/gtk/gtk_theme_service.cc
@@ -309,14 +309,6 @@ gfx::ImageSkia* GtkThemeService::GetImageSkiaNamed(int id) const {
 }
 
 gfx::Image GtkThemeService::GetImageNamed(int id) const {
-  // TODO(akuegel): Remove this once we have the default managed user theme.
-  if (ManagedUserService::ProfileIsManaged(profile())) {
-    if (id == IDR_THEME_FRAME)
-      id = IDR_MANAGED_USER_THEME_FRAME;
-    else if (id == IDR_THEME_FRAME_INACTIVE)
-      id = IDR_MANAGED_USER_THEME_FRAME_INACTIVE;
-  }
-
   // Try to get our cached version:
   ImageCache::const_iterator it = gtk_images_.find(id);
   if (it != gtk_images_.end())
@@ -333,14 +325,6 @@ gfx::Image GtkThemeService::GetImageNamed(int id) const {
 }
 
 SkColor GtkThemeService::GetColor(int id) const {
-  // TODO(akuegel): Remove this once we have the default managed user theme.
-  if (ManagedUserService::ProfileIsManaged(profile())) {
-    if (id == ThemeProperties::COLOR_FRAME)
-      id = ThemeProperties::COLOR_FRAME_MANAGED_USER;
-    else if (id == ThemeProperties::COLOR_FRAME_INACTIVE)
-      id = ThemeProperties::COLOR_FRAME_MANAGED_USER_INACTIVE;
-  }
-
   if (use_gtk_) {
     ColorMap::const_iterator it = colors_.find(id);
     if (it != colors_.end())