| Index: extensions/browser/extension_host.cc
|
| diff --git a/extensions/browser/extension_host.cc b/extensions/browser/extension_host.cc
|
| index e4bc35e0b64edbd8c6723e991b56a9b30c198797..3f1d942ee8fcd00479c811529295312b2792ac87 100644
|
| --- a/extensions/browser/extension_host.cc
|
| +++ b/extensions/browser/extension_host.cc
|
| @@ -29,6 +29,7 @@
|
| #include "extensions/browser/event_router.h"
|
| #include "extensions/browser/extension_error.h"
|
| #include "extensions/browser/extension_host_delegate.h"
|
| +#include "extensions/browser/extension_host_observer.h"
|
| #include "extensions/browser/extension_system.h"
|
| #include "extensions/browser/extensions_browser_client.h"
|
| #include "extensions/browser/notification_types.h"
|
| @@ -159,6 +160,8 @@ ExtensionHost::~ExtensionHost() {
|
| extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED,
|
| content::Source<BrowserContext>(browser_context_),
|
| content::Details<ExtensionHost>(this));
|
| + FOR_EACH_OBSERVER(ExtensionHostObserver, observer_list_,
|
| + OnExtensionHostDestroyed(this));
|
| ProcessCreationQueue::GetInstance()->Remove(this);
|
| }
|
|
|
| @@ -205,6 +208,30 @@ void ExtensionHost::CreateRenderViewNow() {
|
| }
|
| }
|
|
|
| +void ExtensionHost::AddObserver(ExtensionHostObserver* observer) {
|
| + observer_list_.AddObserver(observer);
|
| +}
|
| +
|
| +void ExtensionHost::RemoveObserver(ExtensionHostObserver* observer) {
|
| + observer_list_.RemoveObserver(observer);
|
| +}
|
| +
|
| +void ExtensionHost::OnMessageDispatched(const std::string& event_name,
|
| + int message_id) {
|
| + FOR_EACH_OBSERVER(ExtensionHostObserver, observer_list_,
|
| + OnExtensionMessageDispatched(this, event_name, message_id));
|
| +}
|
| +
|
| +void ExtensionHost::OnNetworkRequestStarted(uint64 request_id) {
|
| + FOR_EACH_OBSERVER(ExtensionHostObserver, observer_list_,
|
| + OnNetworkRequestStarted(this, request_id));
|
| +}
|
| +
|
| +void ExtensionHost::OnNetworkRequestDone(uint64 request_id) {
|
| + FOR_EACH_OBSERVER(ExtensionHostObserver, observer_list_,
|
| + OnNetworkRequestDone(this, request_id));
|
| +}
|
| +
|
| const GURL& ExtensionHost::GetURL() const {
|
| return host_contents()->GetURL();
|
| }
|
| @@ -353,10 +380,13 @@ void ExtensionHost::OnRequest(const ExtensionHostMsg_Request_Params& params) {
|
| extension_function_dispatcher_.Dispatch(params, render_view_host());
|
| }
|
|
|
| -void ExtensionHost::OnEventAck() {
|
| +void ExtensionHost::OnEventAck(int message_id) {
|
| EventRouter* router = EventRouter::Get(browser_context_);
|
| if (router)
|
| router->OnEventAck(browser_context_, extension_id());
|
| +
|
| + FOR_EACH_OBSERVER(ExtensionHostObserver, observer_list_,
|
| + OnExtensionMessageAcked(this, message_id));
|
| }
|
|
|
| void ExtensionHost::OnIncrementLazyKeepaliveCount() {
|
|
|