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

Unified Diff: chrome/browser/extensions/api/processes/processes_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: fix compile error for chromeos build. 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/processes/processes_api.cc
diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc
index 852a64c46ea7ae38737ab1c480581c3fb413e6f8..70bc204131a1ec52cb9b359621b217d6be9e34a9 100644
--- a/chrome/browser/extensions/api/processes/processes_api.cc
+++ b/chrome/browser/extensions/api/processes/processes_api.cc
@@ -34,7 +34,6 @@
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_function_registry.h"
#include "extensions/browser/extension_function_util.h"
-#include "extensions/browser/extension_system.h"
#include "extensions/common/error_utils.h"
namespace extensions {
@@ -470,29 +469,25 @@ void ProcessesEventRouter::ProcessClosedEvent(
void ProcessesEventRouter::DispatchEvent(
const std::string& event_name,
scoped_ptr<base::ListValue> event_args) {
- if (extensions::ExtensionSystem::Get(browser_context_)->event_router()) {
+ EventRouter* event_router = EventRouter::Get(browser_context_);
+ if (event_router) {
scoped_ptr<extensions::Event> event(new extensions::Event(
event_name, event_args.Pass()));
- extensions::ExtensionSystem::Get(browser_context_)
- ->event_router()
- ->BroadcastEvent(event.Pass());
+ event_router->BroadcastEvent(event.Pass());
}
}
bool ProcessesEventRouter::HasEventListeners(const std::string& event_name) {
- extensions::EventRouter* router =
- extensions::ExtensionSystem::Get(browser_context_)->event_router();
- if (router && router->HasEventListener(event_name))
- return true;
- return false;
+ EventRouter* event_router = EventRouter::Get(browser_context_);
+ return event_router && event_router->HasEventListener(event_name);
}
ProcessesAPI::ProcessesAPI(content::BrowserContext* context)
: browser_context_(context) {
- ExtensionSystem::Get(browser_context_)->event_router()->RegisterObserver(
- this, processes_api_constants::kOnUpdated);
- ExtensionSystem::Get(browser_context_)->event_router()->RegisterObserver(
- this, processes_api_constants::kOnUpdatedWithMemory);
+ EventRouter* event_router = EventRouter::Get(browser_context_);
+ event_router->RegisterObserver(this, processes_api_constants::kOnUpdated);
+ event_router->RegisterObserver(this,
+ processes_api_constants::kOnUpdatedWithMemory);
ExtensionFunctionRegistry* registry =
ExtensionFunctionRegistry::GetInstance();
registry->RegisterFunction<extensions::GetProcessIdForTabFunction>();
@@ -504,8 +499,7 @@ ProcessesAPI::~ProcessesAPI() {
}
void ProcessesAPI::Shutdown() {
- ExtensionSystem::Get(browser_context_)->event_router()->UnregisterObserver(
- this);
+ EventRouter::Get(browser_context_)->UnregisterObserver(this);
}
static base::LazyInstance<BrowserContextKeyedAPIFactory<ProcessesAPI> >

Powered by Google App Engine
This is Rietveld 408576698