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 280 matching lines @@
   // We have to call this because FreePlatformCached() in ~ThemeService
   // doesn't call the right virutal FreePlatformCaches.
   FreePlatformCaches();
 }
 
 void GtkThemeService::Init(Profile* profile) {
   registrar_.Init(profile->GetPrefs());
   registrar_.Add(prefs::kUsesSystemTheme,
                  base::Bind(&GtkThemeService::OnUsesSystemThemeChanged,
                             base::Unretained(this)));
   use_gtk_ = profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);

[pkotwicz, 2013/07/23 20:59:52]

Leave |use_gtk_| as false.
ThemeService::SetManagedUserTheme() does not affect |use_gtk_|

[Adrian Kuegel, 2013/07/24 12:31:35]

Done.

   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 25 matching lines @@
   profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, true);
   ClearAllThemeData();
   LoadGtkValues();
   NotifyThemeChanged();
 }
 
 bool GtkThemeService::UsingDefaultTheme() const {
   return !use_gtk_ && ThemeService::UsingDefaultTheme();
 }
 
+bool GtkThemeService::ShouldInitWithNativeTheme() {
+  return profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
+}
+
 bool GtkThemeService::UsingNativeTheme() const {
   return use_gtk_;
 }
 
 GtkWidget* GtkThemeService::BuildChromeButton() {
   GtkWidget* button = HoverControllerGtk::CreateChromeButton();
   gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(button), use_gtk_);
   chrome_buttons_.push_back(button);
 
   signals_->Connect(button, "destroy", G_CALLBACK(OnDestroyChromeButtonThunk),
@@ skipping 244 matching lines @@
 }
 
 void GtkThemeService::ClearAllThemeData() {
   colors_.clear();
   tints_.clear();
 
   ThemeService::ClearAllThemeData();
 }
 
 void GtkThemeService::LoadThemePrefs() {
-  if (use_gtk_) {
-    LoadGtkValues();
-    set_ready();

[Elliot Glaysher, 2013/07/23 19:57:31]

How does |ready_| get set? What are the implications of not setting ready? Just
reading through the code, it looks like it'll clear the theme data and screw up
UMA data for Themes.Gone. (via notification, then ThemeService::MigrateTheme()).

(The first time, but not subsequent times after patching this in locally, a
profile previously with the GTK theme switched to the default theme. Possible
race?)

[Adrian Kuegel, 2013/07/24 12:31:35]

Thanks for looking so closely at this. I have missed that. I agree, looks like
this is what would happen. But we can check in NotifyThemeChanged if |ready_| is
set, and if not, return early. That should fix this problem.
I suppose this has to do with |use_gtk_| being set in OnUsesSystemThemeChanged()
instead of changing it alongside the pref. The way I could always reproduce this
race was if I remove line 301 which initializes |use_gtk_| to the pref value.
Therefore I changed it such that |use_gtk_| also gets set whenever we change the
system theme pref.

-  } else {
-    LoadDefaultValues();
-    ThemeService::LoadThemePrefs();
-  }
+  // This takes care of calling SetNativeTheme() if necessary.
+  ThemeService::LoadThemePrefs();
 
   SetXDGIconTheme();
   RebuildMenuIconSets();
 }
 
 void GtkThemeService::NotifyThemeChanged() {
   ThemeService::NotifyThemeChanged();
 
   // Notify all GtkChromeButtons of their new rendering mode:
   for (std::vector<GtkWidget*>::iterator it = chrome_buttons_.begin();
@@ skipping 515 matching lines @@
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }
 
 void GtkThemeService::OnUsesSystemThemeChanged() {
   use_gtk_ = profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
 }