Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Unified Diff: chrome/browser/themes/theme_service.h

Issue 965233002: Remove deprecated extension notification from theme_service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: guard ENABLE_EXTENSIONS Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/themes/theme_service.cc » ('j') | chrome/browser/themes/theme_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service.h
diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h
index b70fd74c3cdb19ec7b8f273e11b1dbbd4532cba1..df158b624ebb61cb9104c499a11205f58c5ad0bd 100644
--- a/chrome/browser/themes/theme_service.h
+++ b/chrome/browser/themes/theme_service.h
@@ -20,6 +20,10 @@
#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;
@@ -92,6 +96,9 @@ class ThemeService : public base::NonThreadSafe,
NSGradient* GetNSGradient(int id) const override;
#endif
+ // KeyedService:
+ void Shutdown() override;
+
// Overridden from content::NotificationObserver:
void Observe(int type,
const content::NotificationSource& source,
@@ -185,6 +192,9 @@ class ThemeService : public base::NonThreadSafe,
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, y
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 na
limasdf 2015/03/13 03:01:54 Done.
+#endif
// Called when the extension service is ready.
void OnExtensionServiceReady();
@@ -248,6 +258,11 @@ class ThemeService : public base::NonThreadSafe,
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);
« no previous file with comments | « no previous file | chrome/browser/themes/theme_service.cc » ('j') | chrome/browser/themes/theme_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698