Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2207)

Unified Diff: content/renderer/pepper/ppb_video_decoder_impl.h

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/ppb_video_decoder_impl.h
===================================================================
--- content/renderer/pepper/ppb_video_decoder_impl.h (revision 213482)
+++ content/renderer/pepper/ppb_video_decoder_impl.h (working copy)
@@ -2,19 +2,19 @@
// 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_VIDEO_DECODER_IMPL_H_
-#define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
+#ifndef CONTENT_RENDERER_PEPPER_PPB_VIDEO_DECODER_IMPL_H_
+#define CONTENT_RENDERER_PEPPER_PPB_VIDEO_DECODER_IMPL_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
+#include "content/renderer/pepper/plugin_delegate.h"
#include "ppapi/c/dev/pp_video_dev.h"
#include "ppapi/c/dev/ppp_video_decoder_dev.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/shared_impl/ppb_video_decoder_shared.h"
#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/ppb_video_decoder_api.h"
-#include "webkit/plugins/ppapi/plugin_delegate.h"
struct PP_PictureBuffer_Dev;
struct PP_VideoBitstreamBuffer_Dev;
@@ -31,7 +31,6 @@
class PPB_VideoDecoder_Impl : public ::ppapi::PPB_VideoDecoder_Shared,
public media::VideoDecodeAccelerator::Client {
public:
- virtual ~PPB_VideoDecoder_Impl();
// See PPB_VideoDecoder_Dev::Create. Returns 0 on failure to create &
// initialize.
static PP_Resource Create(PP_Instance instance,
@@ -65,6 +64,8 @@
virtual void NotifyResetDone() OVERRIDE;
private:
+ virtual ~PPB_VideoDecoder_Impl();
+
explicit PPB_VideoDecoder_Impl(PP_Instance instance);
bool Init(PP_Resource graphics_context,
PluginDelegate::PlatformContext3D* context,
@@ -84,4 +85,4 @@
} // namespace ppapi
} // namespace webkit
-#endif // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
+#endif // CONTENT_RENDERER_PEPPER_PPB_VIDEO_DECODER_IMPL_H_
« no previous file with comments | « content/renderer/pepper/ppb_var_deprecated_impl.cc ('k') | content/renderer/pepper/ppb_video_decoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698