Make ThemeService use the ExtensionSystem's AsyncEvent

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/memory/weak_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 Profile;
 
 namespace base {
 class FilePath;
 }
@@ skipping 15 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:
   static const char* kDefaultThemeID;
 
   ThemeService();
   virtual ~ThemeService();
 
   virtual void Init(Profile* profile);
@@ skipping 21 matching lines @@
   virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE;
   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
 
-  // Overridden from content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // 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.
@@ skipping 51 matching lines @@
   // from ClearCaches().
   virtual void FreePlatformCaches();
 
   Profile* profile() { return profile_; }
 
   void set_ready() { ready_ = true; }
 
  private:
   friend class ThemeServiceTest;
 
+  void FinishLoadingAfterExtensionsReady();
+
   // Migrate the theme to the new theme pack schema by recreating the data pack
   // from the extension.
   void MigrateTheme();
 
   // Saves the filename of the cached theme pack.
   void SavePackName(const base::FilePath& pack_path);
 
   // Save the id of the last theme installed.
   void SaveThemeID(const std::string& id);
 
@@ skipping 27 matching lines @@
   // True if the theme service is ready to be used.
   // TODO(pkotwicz): Add DCHECKS to the theme service's getters once
   // ThemeSource no longer uses the ThemeService when it is not ready.
   bool ready_;
 
   scoped_refptr<BrowserThemePack> theme_pack_;
 
   // The number of infobars currently displayed.
   int number_of_infobars_;
 
-  content::NotificationRegistrar registrar_;
+  base::WeakPtrFactory<ThemeService> weak_ptr_factory_;
 
   scoped_ptr<ThemeSyncableService> theme_syncable_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_