Index: content/renderer/media/webmediaplayer_params.h |
diff --git a/webkit/renderer/media/webmediaplayer_params.h b/content/renderer/media/webmediaplayer_params.h |
similarity index 78% |
rename from webkit/renderer/media/webmediaplayer_params.h |
rename to content/renderer/media/webmediaplayer_params.h |
index 62a5ce187c7e1b4d444ab8f09bca01541ffa2e1d..90e1458bd7e5f5ed46fcc7e962774967ddfa0c80 100644 |
--- a/webkit/renderer/media/webmediaplayer_params.h |
+++ b/content/renderer/media/webmediaplayer_params.h |
@@ -2,10 +2,11 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_ |
-#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_ |
+#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_ |
+#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_ |
#include "base/memory/ref_counted.h" |
+#include "content/common/content_export.h" |
#include "media/filters/gpu_video_decoder.h" |
namespace base { |
@@ -17,16 +18,18 @@ class AudioRendererSink; |
class MediaLog; |
} |
-namespace webkit_media { |
+namespace content { |
+class MediaPlayerLoadDelegate; |
// Holds parameters for constructing WebMediaPlayerImpl without having |
// to plumb arguments through various abstraction layers. |
-class WebMediaPlayerParams { |
+class CONTENT_EXPORT WebMediaPlayerParams { |
public: |
// |message_loop_proxy| and |media_log| are the only required parameters; |
// all others may be null. |
WebMediaPlayerParams( |
const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy, |
+ MediaPlayerLoadDelegate* load_delegate, |
const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink, |
const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories, |
const scoped_refptr<media::MediaLog>& media_log); |
@@ -36,6 +39,8 @@ class WebMediaPlayerParams { |
return message_loop_proxy_; |
} |
+ MediaPlayerLoadDelegate* load_delegate() const { return load_delegate_; } |
+ |
const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink() const { |
return audio_renderer_sink_; |
} |
@@ -51,6 +56,7 @@ class WebMediaPlayerParams { |
private: |
scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; |
+ MediaPlayerLoadDelegate* load_delegate_; |
scoped_refptr<media::AudioRendererSink> audio_renderer_sink_; |
scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories_; |
scoped_refptr<media::MediaLog> media_log_; |
@@ -60,4 +66,4 @@ class WebMediaPlayerParams { |
} // namespace media |
-#endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_ |
+#endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_ |