Remove deprecated extension notification from theme_service

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 "ui/base/theme_provider.h"
 
+#if defined(ENABLE_EXTENSIONS)
+#include "extensions/browser/extension_registry_observer.h"
+#endif
+
 class CustomThemeSupplier;
 class BrowserThemePack;
 class ThemeSyncableService;
 class Profile;
 
 namespace base {
 class FilePath;
 }
 
 namespace color_utils {
@@ skipping 52 matching lines @@
   base::RefCountedMemory* GetRawData(int id, ui::ScaleFactor scale_factor)
       const override;
 #if defined(OS_MACOSX)
   NSImage* GetNSImageNamed(int id) const override;
   NSColor* GetNSImageColorNamed(int id) const override;
   NSColor* GetNSColor(int id) const override;
   NSColor* GetNSColorTint(int id) const override;
   NSGradient* GetNSGradient(int id) const override;
 #endif
 
+  // KeyedService:
+  void Shutdown() override;
+
   // Overridden from content::NotificationObserver:
   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);
 
@@ skipping 73 matching lines @@
     return theme_supplier_.get();
   }
 
   // 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_;
 
  private:
   friend class theme_service_internal::ThemeServiceTest;
+#if defined(ENABLE_EXTENSIONS)

[not at google - send to devlin, 2015/03/12 17:08:33]

to minimise the number of #if defined(..) calls, you could forward-declare this
down on line 262?

[limasdf, 2015/03/13 03:01:54]

Done.

+  class ExtensionObserver;

[not at google - send to devlin, 2015/03/12 17:10:55]

Also, I think ExtensionObserver could be better named - it doesn't describe its
function. ExtensionRegistryObserverForThemes is a bit of a mouthful, so how
about just ThemeObserver.

[limasdf, 2015/03/13 03:01:54]

Done.

+#endif
 
   // Called when the extension service is ready.
   void OnExtensionServiceReady();
 
   // Migrate the theme to the new theme pack schema by recreating the data pack
   // from the extension.
   void MigrateTheme();
 
   // Replaces the current theme supplier with a new one and calls
   // StopUsingTheme() or StartUsingTheme() as appropriate.
@@ skipping 43 matching lines @@
   // recently installed theme extensions
   std::string installed_pending_load_id_;
 
   // The number of infobars currently displayed.
   int number_of_infobars_;
 
   content::NotificationRegistrar registrar_;
 
   scoped_ptr<ThemeSyncableService> theme_syncable_service_;
 
+#if defined(ENABLE_EXTENSIONS)
+  scoped_ptr<ExtensionObserver> extension_observer_;
+  extensions::ExtensionRegistry* extension_registry_;

[Lei Zhang, 2015/03/12 21:07:23]

Maybe encapsulate this within ExtensionObserver?

[limasdf, 2015/03/13 03:01:54]

Done.

+#endif
+
   base::WeakPtrFactory<ThemeService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_