| Index: content/renderer/media/media_stream_center.h
|
| diff --git a/content/renderer/media/media_stream_center.h b/content/renderer/media/media_stream_center.h
|
| index c8aa2b141eb37a840b8874983efaf4dd1c84e436..bd125b50fc1f6158a16dfc1e9178f0ad9cbc5c69 100644
|
| --- a/content/renderer/media/media_stream_center.h
|
| +++ b/content/renderer/media/media_stream_center.h
|
| @@ -8,9 +8,9 @@
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "content/common/content_export.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamCenter.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamComponent.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescriptor.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
|
|
|
| namespace WebKit {
|
| class WebMediaStreamCenterClient;
|
| @@ -29,18 +29,18 @@ class CONTENT_EXPORT MediaStreamCenter
|
| const WebKit::WebMediaStreamSourcesRequest& request) OVERRIDE;
|
|
|
| virtual void didEnableMediaStreamTrack(
|
| - const WebKit::WebMediaStreamDescriptor& stream,
|
| - const WebKit::WebMediaStreamComponent& component) OVERRIDE;
|
| + const WebKit::WebMediaStream& stream,
|
| + const WebKit::WebMediaStreamTrack& component) OVERRIDE;
|
|
|
| virtual void didDisableMediaStreamTrack(
|
| - const WebKit::WebMediaStreamDescriptor& stream,
|
| - const WebKit::WebMediaStreamComponent& component) OVERRIDE;
|
| + const WebKit::WebMediaStream& stream,
|
| + const WebKit::WebMediaStreamTrack& component) OVERRIDE;
|
|
|
| virtual void didStopLocalMediaStream(
|
| - const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
|
| + const WebKit::WebMediaStream& stream) OVERRIDE;
|
|
|
| virtual void didCreateMediaStream(
|
| - WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
|
| + WebKit::WebMediaStream& stream) OVERRIDE;
|
|
|
| private:
|
| // |rtc_factory_| is a weak pointer and is owned by the RenderThreadImpl.
|
|
|