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

chrome/browser/ui/gtk/gtk_theme_service.cc

 // Copyright (c) 2012 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/ui/gtk/gtk_theme_service.h"
 
 #include <gtk/gtk.h>
 
 #include <set>
 #include <string>
@@ skipping 275 matching lines @@
   fake_entry_.Destroy();
   fake_menu_item_.Destroy();
 
   FreeIconSets();
 
   // We have to call this because FreePlatformCached() in ~ThemeService
   // doesn't call the right virutal FreePlatformCaches.
   FreePlatformCaches();
 }
 
 void GtkThemeService::Init(Profile* profile) {

[pkotwicz, 2013/07/19 18:33:20]

The current code will sometimes use the GTK+ theme instead of the managed user
theme for managed users.
|use_gtk_| does not take into account IsManagedUser().
Note: GtkThemeService::DefaultUsesSystemTheme() sometimes returns true.

You could fix this by overriding ShouldInitWithNativeTheme() and modifying
LoadThemePrefs().

[Adrian Kuegel, 2013/07/22 12:58:08]

Good catch. Done.

   registrar_.Init(profile->GetPrefs());
   registrar_.Add(prefs::kUsesSystemTheme,
                  base::Bind(&GtkThemeService::OnUsesSystemThemeChanged,
                             base::Unretained(this)));
   use_gtk_ = profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
   ThemeService::Init(profile);
 }
 
 gfx::ImageSkia* GtkThemeService::GetImageSkiaNamed(int id) const {
   // TODO(pkotwicz): Remove this const cast.  The gfx::Image interface returns
   // its images const. GetImageSkiaNamed() also should but has many callsites.
   return const_cast<gfx::ImageSkia*>(GetImageNamed(id).ToImageSkia());
 }
 
 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())
     return *it->second;
 
   if (use_gtk_ && IsOverridableImage(id)) {
     gfx::Image* image = new gfx::Image(gfx::ImageSkia::CreateFrom1xBitmap(
         GenerateGtkThemeBitmap(id)));
     gtk_images_[id] = image;
     return *image;
   }
 
   return ThemeService::GetImageNamed(id);
 }
 
 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())
       return it->second;
   }
 
   return ThemeService::GetColor(id);
 }
 
 bool GtkThemeService::HasCustomImage(int id) const {
@@ skipping 831 matching lines @@
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }
 
 void GtkThemeService::OnUsesSystemThemeChanged() {
   use_gtk_ = profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
 }