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

Unified Diff: chrome/browser/extensions/api/processes/processes_api.cc

Issue 11232066: Remove GetExtensionEventRouter from Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rerebase Created 8 years, 2 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 df891d715079b10167ff81f11f281a993cb75d4c..5a500e33b0f988f0d891f6b3787399d43958c0f7 100644
--- a/chrome/browser/extensions/api/processes/processes_api.cc
+++ b/chrome/browser/extensions/api/processes/processes_api.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/extensions/event_router.h"
#include "chrome/browser/extensions/extension_function_util.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/task_manager/task_manager.h"
@@ -475,10 +476,10 @@ void ProcessesEventRouter::ProcessClosedEvent(
void ProcessesEventRouter::DispatchEvent(Profile* profile,
const char* event_name,
scoped_ptr<ListValue> event_args) {
- if (profile && profile->GetExtensionEventRouter()) {
- profile->GetExtensionEventRouter()->DispatchEventToRenderers(
- event_name, event_args.Pass(), NULL, GURL(),
- extensions::EventFilteringInfo());
+ if (profile && extensions::ExtensionSystem::Get(profile)->event_router()) {
+ extensions::ExtensionSystem::Get(profile)->event_router()->
+ DispatchEventToRenderers(event_name, event_args.Pass(), NULL, GURL(),
+ extensions::EventFilteringInfo());
}
}
@@ -500,7 +501,8 @@ bool ProcessesEventRouter::HasEventListeners(const std::string& event_name) {
for (ProfileSet::iterator it = profiles_.begin();
it != profiles_.end(); ++it) {
Profile* profile = *it;
- extensions::EventRouter* router = profile->GetExtensionEventRouter();
+ extensions::EventRouter* router =
+ extensions::ExtensionSystem::Get(profile)->event_router();
if (!router)
continue;

Powered by Google App Engine
This is Rietveld 408576698