Index: content/renderer/pepper/ppb_broker_impl.h |
=================================================================== |
--- content/renderer/pepper/ppb_broker_impl.h (revision 213482) |
+++ content/renderer/pepper/ppb_broker_impl.h (working copy) |
@@ -2,30 +2,27 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_ |
-#define WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_ |
+#ifndef CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_ |
+#define CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/weak_ptr.h" |
+#include "content/renderer/pepper/plugin_delegate.h" |
#include "ppapi/c/pp_completion_callback.h" |
#include "ppapi/c/trusted/ppb_broker_trusted.h" |
#include "ppapi/shared_impl/resource.h" |
#include "ppapi/shared_impl/tracked_callback.h" |
#include "ppapi/thunk/ppb_broker_api.h" |
-#include "webkit/plugins/ppapi/plugin_delegate.h" |
-#include "webkit/plugins/webkit_plugins_export.h" |
namespace webkit { |
namespace ppapi { |
-class WEBKIT_PLUGINS_EXPORT PPB_Broker_Impl |
- : public ::ppapi::Resource, |
- NON_EXPORTED_BASE(public ::ppapi::thunk::PPB_Broker_API), |
- public base::SupportsWeakPtr<PPB_Broker_Impl> { |
+class PPB_Broker_Impl : public ::ppapi::Resource, |
+ public ::ppapi::thunk::PPB_Broker_API, |
+ public base::SupportsWeakPtr<PPB_Broker_Impl> { |
public: |
explicit PPB_Broker_Impl(PP_Instance instance); |
- virtual ~PPB_Broker_Impl(); |
// Resource override. |
virtual ::ppapi::thunk::PPB_Broker_API* AsPPB_Broker_API() OVERRIDE; |
@@ -42,6 +39,7 @@ |
void BrokerConnected(int32_t handle, int32_t result); |
private: |
+ virtual ~PPB_Broker_Impl(); |
// PluginDelegate ppapi broker object. |
// We don't own this pointer but are responsible for calling Disconnect on it. |
PluginDelegate::Broker* broker_; |
@@ -59,4 +57,4 @@ |
} // namespace ppapi |
} // namespace webkit |
-#endif // WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_ |
+#endif // CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_ |