Revert changes to have ExtensionService notify ThemeService directly

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 130 matching lines @@
   virtual void SetNativeTheme();
 
   // Whether we're using the chrome default theme. Virtual so linux can check
   // if we're using the GTK theme.
   virtual bool UsingDefaultTheme() const;
 
   // Whether we're using the native theme (which may or may not be the
   // same as the default theme).
   virtual bool UsingNativeTheme() const;
 
+  // Gets the id of the last installed theme. (The theme may have been further
+  // locally customized.)
+  virtual std::string GetThemeID() const;
+
   // This class needs to keep track of the number of theme infobars so that we
   // clean up unused themes.
   void OnInfobarDisplayed();
 
   // Decrements the number of theme infobars. If the last infobar has been
   // destroyed, uninstalls all themes that aren't the currently selected.
   void OnInfobarDestroyed();
 
-  // Gets the id of the last installed theme for |profile|. (The theme
-  // may have been further locally customized.)
-  static std::string GetThemeIDForProfile(Profile* profile);
-
-  // Save the id of the last theme installed.  If the theme service
-  // already exists, SetTheme() must be used instead.
-  static void SaveThemeIDForProfile(Profile* profile, const std::string& id);
-
-  // Uninstall extensions for themes that are no longer in use.
-  static void RemoveUnusedThemesForProfile(Profile* profile);
-
-  // Gets the id of the last installed theme. (The theme may have been
-  // further locally customized.)
-  //
-  // TODO(akalin): Make everything use GetThemeIDForProfile().
-  virtual std::string GetThemeID() const;
-
   // Convert a bitfield alignment into a string like "top left". Public so that
   // it can be used to generate CSS values. Takes a bitmask of Alignment.
   static std::string AlignmentToString(int alignment);
 
   // Parse alignments from something like "top left" into a bitmask of
   // Alignment.
   static int StringToAlignment(const std::string& alignment);
 
   // Convert a tiling value into a string like "no-repeat". Public
   // so that it can be used to generate CSS values. Takes a Tiling.
   static std::string TilingToString(int tiling);
 
   // Parse tiling values from something like "no-repeat" into a Tiling value.
   static int StringToTiling(const std::string& tiling);
 
   // Returns the default tint for the given tint |id| TINT_* enum value.
   static color_utils::HSL GetDefaultTint(int id);
 
   // Returns the default color for the given color |id| COLOR_* enum value.
   static SkColor GetDefaultColor(int id);
 
   // Returns true and sets |result| to the requested default property, if |id|
   // is valid.
   static bool GetDefaultDisplayProperty(int id, int* result);
 
   // Returns the set of IDR_* resources that should be tinted.
   static const std::set<int>& GetTintableToolbarButtons();
 
+  // Remove preference values for themes that are no longer in use.
+  void RemoveUnusedThemes();
+
   // Returns the syncable service for syncing theme. The returned service is
   // owned by |this| object.
   virtual ThemeSyncableService* GetThemeSyncableService() const;
 
   // Save the images to be written to disk, mapping file path to id.
   typedef std::map<FilePath, int> ImagesDiskCache;
 
  protected:
   // Get the specified tint - |id| is one of the TINT_* enum values.
   color_utils::HSL GetTint(int id) const;
@@ skipping 11 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
   // case we don't have a theme pack).
   void BuildFromExtension(const extensions::Extension* extension);
 
 #if defined(TOOLKIT_GTK)
   // Loads an image and flips it horizontally if |rtl_enabled| is true.
   GdkPixbuf* GetPixbufImpl(int id, bool rtl_enabled) const;
 #endif
 
 #if defined(TOOLKIT_GTK)
@@ skipping 12 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_