Index: webkit/plugins/ppapi/ppb_video_capture_impl.h |
diff --git a/webkit/plugins/ppapi/ppb_video_capture_impl.h b/webkit/plugins/ppapi/ppb_video_capture_impl.h |
index d05747d59ee5878b4468e1998e28dc15bba53d08..f99c989fcd6c4a0d715db622751876d4d01c62b1 100644 |
--- a/webkit/plugins/ppapi/ppb_video_capture_impl.h |
+++ b/webkit/plugins/ppapi/ppb_video_capture_impl.h |
@@ -13,10 +13,10 @@ |
#include "base/memory/scoped_ptr.h" |
#include "media/video/capture/video_capture.h" |
#include "ppapi/c/dev/ppp_video_capture_dev.h" |
+#include "ppapi/shared_impl/resource.h" |
#include "ppapi/thunk/ppb_video_capture_api.h" |
#include "webkit/plugins/ppapi/plugin_delegate.h" |
#include "webkit/plugins/ppapi/ppb_buffer_impl.h" |
-#include "webkit/plugins/ppapi/resource.h" |
struct PP_VideoCaptureDeviceInfo_Dev; |
struct PPB_VideoCapture_Dev; |
@@ -24,13 +24,11 @@ struct PPB_VideoCapture_Dev; |
namespace webkit { |
namespace ppapi { |
-class PluginInstance; |
- |
-class PPB_VideoCapture_Impl : public Resource, |
+class PPB_VideoCapture_Impl : public ::ppapi::Resource, |
public ::ppapi::thunk::PPB_VideoCapture_API, |
public media::VideoCapture::EventHandler { |
public: |
- explicit PPB_VideoCapture_Impl(PluginInstance* instance); |
+ explicit PPB_VideoCapture_Impl(PP_Instance instance); |
virtual ~PPB_VideoCapture_Impl(); |
bool Init(); |