Remove deprecated extension notification from themeservice.

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 "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "extensions/browser/extension_registry_observer.h"
 #include "ui/base/theme_provider.h"
 
 class CustomThemeSupplier;
 class BrowserThemePack;
 class ThemeSyncableService;
 class Profile;
 
 namespace base {
 class FilePath;
 }
 
 namespace color_utils {
 struct HSL;
 }
 
 namespace extensions {
 class Extension;
+class ExtensionRegistry;
 }
 
 namespace gfx {
 class Image;
 }
 
 namespace theme_service_internal {
 class ThemeServiceTest;
 }
 
 namespace ui {
 class ResourceBundle;
 }
 
 #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 extensions::ExtensionRegistryObserver,
                      public KeyedService,
                      public ui::ThemeProvider {
  public:
   // Public constants used in ThemeService and its subclasses:
   static const char* kDefaultThemeID;
 
   ThemeService();
   virtual ~ThemeService();
 
   virtual void Init(Profile* profile);
 
   // Returns a cross platform image for an id.
   //
   // TODO(erg): Make this part of the ui::ThemeProvider and the main way to get
   // theme properties out of the theme provider since it's cross platform.
   virtual gfx::Image GetImageNamed(int id) const;
 
   // Overridden from ui::ThemeProvider:

[pkotwicz, 2014/09/16 15:18:25]

Nit: Can you change the comment to "ui::ThemeProvider:" ?

[Jitu( very slow this week), 2014/09/24 11:48:15]

Done.

   virtual bool UsingSystemTheme() const OVERRIDE;
   virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
   virtual SkColor GetColor(int id) const OVERRIDE;
   virtual int GetDisplayProperty(int id) const OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual bool HasCustomImage(int id) const OVERRIDE;
   virtual base::RefCountedMemory* GetRawData(
       int id,
       ui::ScaleFactor scale_factor) const OVERRIDE;
 #if defined(OS_MACOSX)
   virtual NSImage* GetNSImageNamed(int id) const OVERRIDE;
   virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE;
   virtual NSColor* GetNSColor(int id) const OVERRIDE;
   virtual NSColor* GetNSColorTint(int id) const OVERRIDE;
   virtual NSGradient* GetNSGradient(int id) const OVERRIDE;
 #endif
 
   // Overridden from content::NotificationObserver:

[pkotwicz, 2014/09/16 15:18:25]

Nit: Can you change the comment to "content::NotificationObserver:" ?

   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // Overridden from extensions::ExtensionRegistryObserver:

[pkotwicz, 2014/09/16 15:18:25]

I think the new style for these comments is
"extensions::ExtensionRegistryObserver:"

Optional: Order the overrides in the order that they were declared in
extensions::ExtensionRegistryObserver

[Jitu( very slow this week), 2014/09/24 11:48:15]

Done.

+  virtual void OnExtensionWillBeInstalled(
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension,
+      bool is_update,
+      bool from_ephemeral,
+      const std::string& old_name) OVERRIDE;

[pkotwicz, 2014/09/16 15:18:25]

Nit: Remove the new line

[Jitu( very slow this week), 2014/09/24 11:48:16]

Done.

+
+  virtual void OnExtensionLoaded(
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension) OVERRIDE;

[pkotwicz, 2014/09/16 15:18:25]

Nit: Remove the new line

[Jitu( very slow this week), 2014/09/24 11:48:15]

Done.

+
+  virtual void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension,
+      extensions::UnloadedExtensionInfo::Reason reason) 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 system theme. On some platforms, the system
   // theme is the default theme.
@@ skipping 127 matching lines @@
   // never be loaded if the install is due to updating a disabled theme.
   // |pending_install_id_| should be set to |kDefaultThemeID| if there are no
   // recently installed theme extensions
   std::string installed_pending_load_id_;
 
   // The number of infobars currently displayed.
   int number_of_infobars_;
 
   content::NotificationRegistrar registrar_;
 
+  extensions::ExtensionRegistry* extension_registry_;
+
   scoped_ptr<ThemeSyncableService> theme_syncable_service_;
 
   base::WeakPtrFactory<ThemeService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_