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

Unified Diff: extensions/browser/event_router.h

Issue 2893693002: Remove NOTIFICATION_EXTENSION_ENABLED. (Closed)
Patch Set: address comments Created 3 years, 7 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
Index: extensions/browser/event_router.h
diff --git a/extensions/browser/event_router.h b/extensions/browser/event_router.h
index 48bc266980cce4ce121f64a3402d8afbc5926e8a..93d0cb3beef41dcd259e2687d554b122c663bf28 100644
--- a/extensions/browser/event_router.h
+++ b/extensions/browser/event_router.h
@@ -18,10 +18,9 @@
#include "base/scoped_observer.h"
#include "base/values.h"
#include "components/keyed_service/core/keyed_service.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/render_process_host_observer.h"
#include "extensions/browser/event_listener_map.h"
+#include "extensions/browser/events/lazy_event_dispatch_util.h"
#include "extensions/browser/extension_event_histogram_value.h"
#include "extensions/browser/extension_registry_observer.h"
#include "extensions/common/event_filtering_info.h"
@@ -45,7 +44,6 @@ struct Event;
struct EventListenerInfo;
class EventRouter : public KeyedService,
- public content::NotificationObserver,
public ExtensionRegistryObserver,
public EventListenerMap::Delegate,
public content::RenderProcessHostObserver {
@@ -200,6 +198,10 @@ class EventRouter : public KeyedService,
const Extension* extension,
bool did_enqueue);
+ LazyEventDispatchUtil* lazy_event_dispatch_util() {
+ return &lazy_event_dispatch_util_;
+ }
+
private:
friend class EventRouterFilterTest;
friend class EventRouterTest;
@@ -227,9 +229,6 @@ class EventRouter : public KeyedService,
void SetRegisteredEvents(const std::string& extension_id,
const std::set<std::string>& events);
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) override;
// ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const Extension* extension) override;
@@ -327,8 +326,6 @@ class EventRouter : public KeyedService,
// tests.
ExtensionPrefs* extension_prefs_;
- content::NotificationRegistrar registrar_;
-
ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observer_;
@@ -340,6 +337,8 @@ class EventRouter : public KeyedService,
std::set<content::RenderProcessHost*> observed_process_set_;
+ LazyEventDispatchUtil lazy_event_dispatch_util_;
+
DISALLOW_COPY_AND_ASSIGN(EventRouter);
};

Powered by Google App Engine
This is Rietveld 408576698