Revert changes to have ExtensionService notify ThemeService directly

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 276 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);
   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 {
@@ skipping 21 matching lines @@
   return ThemeService::GetColor(id);
 }
 
 bool GtkThemeService::HasCustomImage(int id) const {
   if (use_gtk_)
     return IsOverridableImage(id);
 
   return ThemeService::HasCustomImage(id);
 }
 
-void GtkThemeService::InitThemesFor(content::NotificationObserver* observer) {
+void GtkThemeService::InitThemesFor(NotificationObserver* observer) {
   observer->Observe(chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                     content::Source<ThemeService>(this),
                     content::NotificationService::NoDetails());
 }
 
 void GtkThemeService::SetTheme(const extensions::Extension* extension) {
   profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, false);
   LoadDefaultValues();
   ThemeService::SetTheme(extension);
 }
@@ skipping 263 matching lines @@
 }
 
 void GtkThemeService::ClearAllThemeData() {
   colors_.clear();
   tints_.clear();
 
   ThemeService::ClearAllThemeData();
 }
 
 void GtkThemeService::LoadThemePrefs() {
-  if (ThemeService::UsingDefaultTheme()) {
-    use_gtk_ = profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
-  } else {
-    // Do this here since ThemeServiceFactory::SetThemeForProfile()
-    // doesn't know to set kUsesSystemTheme to false.
-    profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, false);
-    use_gtk_ = false;
-  }
   if (use_gtk_) {
     LoadGtkValues();
   } else {
     LoadDefaultValues();
     ThemeService::LoadThemePrefs();
   }
 
   RebuildMenuIconSets();
 }
 
@@ skipping 511 matching lines @@
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }
 
 void GtkThemeService::OnUsesSystemThemeChanged() {
   use_gtk_ = profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
 }