Index: content/renderer/pepper/ppb_audio_impl.h |
=================================================================== |
--- content/renderer/pepper/ppb_audio_impl.h (revision 213482) |
+++ content/renderer/pepper/ppb_audio_impl.h (working copy) |
@@ -2,13 +2,15 @@ |
// 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_AUDIO_IMPL_H_ |
-#define WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_ |
+#ifndef CONTENT_RENDERER_PEPPER_PPB_AUDIO_IMPL_H_ |
+#define CONTENT_RENDERER_PEPPER_PPB_AUDIO_IMPL_H_ |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/shared_memory.h" |
#include "base/sync_socket.h" |
+#include "content/renderer/pepper/audio_helper.h" |
+#include "content/renderer/pepper/plugin_delegate.h" |
#include "ppapi/c/pp_completion_callback.h" |
#include "ppapi/c/ppb_audio.h" |
#include "ppapi/c/ppb_audio_config.h" |
@@ -16,8 +18,6 @@ |
#include "ppapi/shared_impl/ppb_audio_shared.h" |
#include "ppapi/shared_impl/resource.h" |
#include "ppapi/shared_impl/scoped_pp_resource.h" |
-#include "webkit/plugins/ppapi/audio_helper.h" |
-#include "webkit/plugins/ppapi/plugin_delegate.h" |
namespace webkit { |
namespace ppapi { |
@@ -34,8 +34,6 @@ |
// to properly create & initialize this class. |
explicit PPB_Audio_Impl(PP_Instance instance); |
- virtual ~PPB_Audio_Impl(); |
- |
// Creation function for untrusted plugins. This handles all initialization |
// and will return 0 on failure. |
static PP_Resource Create(PP_Instance instance, |
@@ -49,7 +47,7 @@ |
void* user_data); |
// Resource overrides. |
- virtual ::ppapi::thunk::PPB_Audio_API* AsPPB_Audio_API(); |
+ virtual ::ppapi::thunk::PPB_Audio_API* AsPPB_Audio_API() OVERRIDE; |
// PPB_Audio_API implementation. |
virtual PP_Resource GetCurrentConfig() OVERRIDE; |
@@ -62,10 +60,12 @@ |
virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) OVERRIDE; |
private: |
+ virtual ~PPB_Audio_Impl(); |
+ |
// AudioHelper implementation. |
virtual void OnSetStreamInfo(base::SharedMemoryHandle shared_memory_handle, |
size_t shared_memory_size_, |
- base::SyncSocket::Handle socket); |
+ base::SyncSocket::Handle socket) OVERRIDE; |
// AudioConfig used for creating this Audio object. We own a ref. |
::ppapi::ScopedPPResource config_; |
@@ -83,4 +83,4 @@ |
} // namespace ppapi |
} // namespace webkit |
-#endif // WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_ |
+#endif // CONTENT_RENDERER_PEPPER_PPB_AUDIO_IMPL_H_ |