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

Unified Diff: chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc

Issue 238633009: cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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: chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
index c6c748c12d8fdf29d5a398eb8cf55f4db25e8b9c..bb99213470b6272e1ffa5d4ebddc146ffa50a34d 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
@@ -14,7 +14,6 @@
#include "chrome/common/extensions/api/activity_log_private.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/browser_context.h"
-#include "extensions/browser/extension_system.h"
#include "extensions/browser/extension_system_provider.h"
#include "extensions/browser/extensions_browser_client.h"
#include "extensions/common/features/feature.h"
@@ -46,14 +45,13 @@ BrowserContextKeyedAPIFactory<ActivityLogAPI>::DeclareFactoryDependencies() {
ActivityLogAPI::ActivityLogAPI(content::BrowserContext* context)
: browser_context_(context), initialized_(false) {
- if (!ExtensionSystem::Get(browser_context_)
- ->event_router()) { // Check for testing.
+ if (!EventRouter::Get(browser_context_)) { // Check for testing.
DVLOG(1) << "ExtensionSystem event_router does not exist.";
return;
}
activity_log_ = extensions::ActivityLog::GetInstance(browser_context_);
DCHECK(activity_log_);
- ExtensionSystem::Get(browser_context_)->event_router()->RegisterObserver(
+ EventRouter::Get(browser_context_)->RegisterObserver(
this, activity_log_private::OnExtensionActivity::kEventName);
activity_log_->AddObserver(this);
initialized_ = true;
@@ -67,8 +65,7 @@ void ActivityLogAPI::Shutdown() {
DVLOG(1) << "ExtensionSystem event_router does not exist.";
return;
}
- ExtensionSystem::Get(browser_context_)->event_router()->UnregisterObserver(
- this);
+ EventRouter::Get(browser_context_)->UnregisterObserver(this);
activity_log_->RemoveObserver(this);
}
@@ -95,8 +92,7 @@ void ActivityLogAPI::OnExtensionActivity(scoped_refptr<Action> activity) {
new Event(activity_log_private::OnExtensionActivity::kEventName,
value.Pass()));
event->restrict_to_browser_context = browser_context_;
- ExtensionSystem::Get(browser_context_)->event_router()->BroadcastEvent(
- event.Pass());
+ EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass());
}
bool ActivityLogPrivateGetExtensionActivitiesFunction::RunImpl() {

Powered by Google App Engine
This is Rietveld 408576698