| Index: chrome/browser/extensions/api/api_resource_manager.h
|
| diff --git a/chrome/browser/extensions/api/api_resource_manager.h b/chrome/browser/extensions/api/api_resource_manager.h
|
| index 3a115ca5dc80790fd223432af150c34056c3eb7d..f48581299fdb158ee30df6a9506a8b7f6fbe3559 100644
|
| --- a/chrome/browser/extensions/api/api_resource_manager.h
|
| +++ b/chrome/browser/extensions/api/api_resource_manager.h
|
| @@ -23,15 +23,16 @@
|
| #include "extensions/common/extension.h"
|
|
|
| namespace extensions {
|
| +
|
| namespace api {
|
| class SerialEventDispatcher;
|
| +}
|
| +
|
| +namespace core_api {
|
| class TCPServerSocketEventDispatcher;
|
| class TCPSocketEventDispatcher;
|
| class UDPSocketEventDispatcher;
|
| }
|
| -}
|
| -
|
| -namespace extensions {
|
|
|
| // An ApiResourceManager manages the lifetime of a set of resources that
|
| // ApiFunctions use. Examples are sockets or USB connections.
|
| @@ -154,12 +155,15 @@ class ApiResourceManager : public BrowserContextKeyedAPI,
|
| }
|
|
|
| private:
|
| + // TODO(rockot): ApiResourceData could be moved out of ApiResourceManager and
|
| + // we could avoid maintaining a friends list here.
|
| friend class api::SerialEventDispatcher;
|
| - friend class api::TCPServerSocketEventDispatcher;
|
| - friend class api::TCPSocketEventDispatcher;
|
| - friend class api::UDPSocketEventDispatcher;
|
| + friend class core_api::TCPServerSocketEventDispatcher;
|
| + friend class core_api::TCPSocketEventDispatcher;
|
| + friend class core_api::UDPSocketEventDispatcher;
|
| friend class BrowserContextKeyedAPIFactory<ApiResourceManager<T> >;
|
| - // BrowserContextKeyedAPI implementation.
|
| +
|
| + // BrowserContextKeyed API implementation.
|
| static const char* service_name() {
|
| return T::service_name();
|
| }
|
|
|