Index: chrome/browser/extensions/event_router.cc |
diff --git a/chrome/browser/extensions/event_router.cc b/chrome/browser/extensions/event_router.cc |
index b6683a6f4c5df142df87e9a811be43e2215f674f..7fdb8b815d2c1b938dbc57b05d002b519d5eda1f 100644 |
--- a/chrome/browser/extensions/event_router.cc |
+++ b/chrome/browser/extensions/event_router.cc |
@@ -13,8 +13,6 @@ |
#include "base/values.h" |
#include "base/version.h" |
#include "chrome/browser/browser_process.h" |
-#include "chrome/browser/extensions/api/processes/processes_api_constants.h" |
-#include "chrome/browser/extensions/api/processes/processes_api.h" |
#include "chrome/browser/extensions/api/runtime/runtime_api.h" |
#include "chrome/browser/extensions/api/web_request/web_request_api.h" |
#include "chrome/browser/extensions/event_names.h" |
@@ -166,24 +164,25 @@ void EventRouter::RemoveEventListener(const std::string& event_name, |
listeners_.RemoveListener(&listener); |
} |
+void EventRouter::RegisterObserver(Observer* observer, |
+ const std::string& event_name) { |
+ observers_[event_name] = observer; |
+} |
+ |
void EventRouter::OnListenerAdded(const EventListener* listener) { |
// We don't care about lazy events being added. |
if (!listener->process) |
return; |
+ const std::string& event_name = listener->event_name; |
+ ObserverMap::iterator observer = observers_.find(event_name); |
+ if (observer != observers_.end()) |
+ observer->second->OnListenerAdded(event_name); |
+ |
if (extension_devtools_manager_.get()) |
- extension_devtools_manager_->AddEventListener(listener->event_name, |
+ extension_devtools_manager_->AddEventListener(event_name, |
listener->process->GetID()); |
- // We lazily tell the TaskManager to start updating when listeners to the |
- // processes.onUpdated or processes.onUpdatedWithMemory events arrive. |
- const std::string& event_name = listener->event_name; |
- if (event_name.compare( |
- extensions::processes_api_constants::kOnUpdated) == 0 || |
- event_name.compare( |
- extensions::processes_api_constants::kOnUpdatedWithMemory) == 0) |
- extensions::ProcessesEventRouter::GetInstance()->ListenerAdded(); |
- |
if (SystemInfoEventRouter::IsSystemInfoEvent(event_name)) |
SystemInfoEventRouter::GetInstance()->AddEventListener(event_name); |
} |
@@ -194,23 +193,18 @@ void EventRouter::OnListenerRemoved(const EventListener* listener) { |
return; |
const std::string& event_name = listener->event_name; |
+ ObserverMap::iterator observer = observers_.find(event_name); |
+ if (observer != observers_.end()) |
+ observer->second->OnListenerRemoved(event_name); |
+ |
if (extension_devtools_manager_.get()) |
extension_devtools_manager_->RemoveEventListener( |
event_name, listener->process->GetID()); |
- // If a processes.onUpdated or processes.onUpdatedWithMemory event listener |
- // is removed (or a process with one exits), then we let the extension API |
- // know that it has one fewer listener. |
- if (event_name.compare( |
- extensions::processes_api_constants::kOnUpdated) == 0 || |
- event_name.compare( |
- extensions::processes_api_constants::kOnUpdatedWithMemory) == 0) |
- extensions::ProcessesEventRouter::GetInstance()->ListenerRemoved(); |
- |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
base::Bind(&NotifyEventListenerRemovedOnIOThread, |
- profile_, listener->extension_id, listener->event_name)); |
+ profile_, listener->extension_id, event_name)); |
if (SystemInfoEventRouter::IsSystemInfoEvent(event_name)) |
SystemInfoEventRouter::GetInstance()->RemoveEventListener(event_name); |