Index: content/renderer/pepper/pepper_platform_audio_output_impl.h |
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.h b/content/renderer/pepper/pepper_platform_audio_output_impl.h |
index 5fab0e4af4b3748aebc4d7feea7b259d5fd2f92b..3a426df776cfc5f73d2aabe8a37b3e49058b815c 100644 |
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.h |
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.h |
@@ -7,6 +7,7 @@ |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
+#include "base/memory/scoped_ptr.h" |
#include "media/audio/audio_output_ipc.h" |
#include "webkit/plugins/ppapi/plugin_delegate.h" |
@@ -28,6 +29,7 @@ class PepperPlatformAudioOutputImpl |
// Factory function, returns NULL on failure. StreamCreated() will be called |
// when the stream is created. |
static PepperPlatformAudioOutputImpl* Create( |
+ int render_view_id, |
int sample_rate, |
int frames_per_buffer, |
webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client); |
@@ -51,7 +53,7 @@ class PepperPlatformAudioOutputImpl |
private: |
friend class base::RefCountedThreadSafe<PepperPlatformAudioOutputImpl>; |
- PepperPlatformAudioOutputImpl(); |
+ explicit PepperPlatformAudioOutputImpl(int render_view_id); |
bool Initialize( |
int sample_rate, |
@@ -70,7 +72,7 @@ class PepperPlatformAudioOutputImpl |
// Used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE |
// I/O thread except to send messages and get the message loop. |
- media::AudioOutputIPC* ipc_; |
+ scoped_ptr<media::AudioOutputIPC> ipc_; |
// Our ID on the MessageFilter. THIS MUST ONLY BE ACCESSED ON THE I/O THREAD |
// or else you could race with the initialize function which sets it. |
@@ -78,7 +80,7 @@ class PepperPlatformAudioOutputImpl |
base::MessageLoopProxy* main_message_loop_proxy_; |
- DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioOutputImpl); |
+ DISALLOW_IMPLICIT_CONSTRUCTORS(PepperPlatformAudioOutputImpl); |
}; |
} // namespace content |