Revert changes to have ExtensionService notify ThemeService directly for themes

chrome/browser/themes/theme_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "ui/base/theme_provider.h"
 
 class BrowserThemePack;
 class ThemeServiceTest;
 class ThemeSyncableService;
 class FilePath;
 class Profile;
 
 namespace color_utils {
 struct HSL;
@@ skipping 12 matching lines @@
 }
 
 #ifdef __OBJC__
 @class NSString;
 // Sent whenever the browser theme changes.  Object => NSValue wrapping the
 // ThemeService that changed.
 extern "C" NSString* const kBrowserThemeDidChangeNotification;
 #endif  // __OBJC__
 
 class ThemeService : public base::NonThreadSafe,
+                     public content::NotificationObserver,
                      public ProfileKeyedService,
                      public ui::ThemeProvider {
  public:
   // Public constants used in ThemeService and its subclasses:
 
   // Strings used in alignment properties.
   static const char* kAlignmentCenter;
   static const char* kAlignmentTop;
   static const char* kAlignmentBottom;
   static const char* kAlignmentLeft;
@@ skipping 113 matching lines @@
   virtual NSGradient* GetNSGradient(int id) const OVERRIDE;
 #elif defined(OS_POSIX) && !defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID)
   // This mismatch between what this class defines and whether or not it
   // overrides ui::ThemeProvider is http://crbug.com/105040 .
   // GdkPixbufs returned by GetPixbufNamed and GetRTLEnabledPixbufNamed are
   // shared instances owned by the theme provider and should not be freed.
   virtual GdkPixbuf* GetRTLEnabledPixbufNamed(int id) const OVERRIDE;
 #endif
 
   // Set the current theme to the theme defined in |extension|.
-  // |extension| must already be added to this profile's
-  // ExtensionService.
   virtual void SetTheme(const extensions::Extension* extension);
 
   // Reset the theme to default.
   virtual void UseDefaultTheme();
 
   // Set the current theme to the native theme. On some platforms, the native
   // theme is the default theme.
   virtual void SetNativeTheme();
 
   // Whether we're using the chrome default theme. Virtual so linux can check
@@ skipping 71 matching lines @@
   // Let all the browser views know that themes have changed in a platform way.
   virtual void NotifyPlatformThemeChanged();
 #endif  // OS_MACOSX
 
   // Clears the platform-specific caches. Do not call directly; it's called
   // from ClearCaches().
   virtual void FreePlatformCaches();
 
   Profile* profile() { return profile_; }
 
+  // content::NotificationObserver:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
  private:
   friend class ThemeServiceTest;
 
   // Saves the filename of the cached theme pack.
   void SavePackName(const FilePath& pack_path);
 
   // Save the id of the last theme installed.
   void SaveThemeID(const std::string& id);
 
   // Implementation of SetTheme() (and the fallback from LoadThemePrefs() in
@@ skipping 21 matching lines @@
 #endif
 
   ui::ResourceBundle& rb_;
   Profile* profile_;
 
   scoped_refptr<BrowserThemePack> theme_pack_;
 
   // The number of infobars currently displayed.
   int number_of_infobars_;
 
+  content::NotificationRegistrar registrar_;
+
   scoped_ptr<ThemeSyncableService> theme_syncable_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_