| Index: ppapi/shared_impl/private/ppb_host_resolver_shared.h
|
| diff --git a/ppapi/shared_impl/private/ppb_host_resolver_shared.h b/ppapi/shared_impl/private/ppb_host_resolver_shared.h
|
| index 7372dc54eb7be0f83b4c867ac2eca0b5a19538ca..8fe533e16900e21aef52d3e42eab2174c782b209 100644
|
| --- a/ppapi/shared_impl/private/ppb_host_resolver_shared.h
|
| +++ b/ppapi/shared_impl/private/ppb_host_resolver_shared.h
|
| @@ -10,7 +10,6 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "ppapi/shared_impl/resource.h"
|
| #include "ppapi/shared_impl/tracked_callback.h"
|
| #include "ppapi/thunk/ppb_host_resolver_private_api.h"
|
|
|
| @@ -22,20 +21,10 @@ struct HostPortPair {
|
| };
|
|
|
| class PPAPI_SHARED_EXPORT PPB_HostResolver_Shared
|
| - : public thunk::PPB_HostResolver_Private_API,
|
| - public Resource {
|
| + : public thunk::PPB_HostResolver_Private_API {
|
| public:
|
| - // C-tor used in Impl case.
|
| - explicit PPB_HostResolver_Shared(PP_Instance instance);
|
| -
|
| - // C-tor used in Proxy case.
|
| - explicit PPB_HostResolver_Shared(const HostResource& resource);
|
| -
|
| - virtual ~PPB_HostResolver_Shared();
|
| -
|
| - // Resource overrides.
|
| - virtual PPB_HostResolver_Private_API*
|
| - AsPPB_HostResolver_Private_API() OVERRIDE;
|
| + PPB_HostResolver_Shared() {}
|
| + virtual ~PPB_HostResolver_Shared() {}
|
|
|
| // PPB_HostResolver_Private_API implementation.
|
| virtual int32_t Resolve(const char* host,
|
| @@ -58,11 +47,8 @@ class PPAPI_SHARED_EXPORT PPB_HostResolver_Shared
|
| const PP_HostResolver_Private_Hint* hint) = 0;
|
|
|
| protected:
|
| - static uint32 GenerateHostResolverID();
|
| bool ResolveInProgress() const;
|
|
|
| - const uint32 host_resolver_id_;
|
| -
|
| scoped_refptr<TrackedCallback> resolve_callback_;
|
|
|
| std::string canonical_name_;
|
|
|