| 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 cc9497957dfb7a572dffbd616aba472f628eebca..c3f2c36312251ac4dddcb4568da3123ea056c2d2 100644
|
| --- a/content/renderer/media/media_stream_center.h
|
| +++ b/content/renderer/media/media_stream_center.h
|
| @@ -17,7 +17,7 @@
|
| #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
|
| #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h"
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebMediaStreamCenterClient;
|
| }
|
|
|
| @@ -25,41 +25,41 @@ namespace content {
|
| class MediaStreamDependencyFactory;
|
|
|
| class CONTENT_EXPORT MediaStreamCenter
|
| - : NON_EXPORTED_BASE(public WebKit::WebMediaStreamCenter),
|
| + : NON_EXPORTED_BASE(public blink::WebMediaStreamCenter),
|
| public RenderProcessObserver {
|
| public:
|
| - MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client,
|
| + MediaStreamCenter(blink::WebMediaStreamCenterClient* client,
|
| MediaStreamDependencyFactory* factory);
|
| virtual ~MediaStreamCenter();
|
|
|
| private:
|
| virtual bool getMediaStreamTrackSources(
|
| - const WebKit::WebMediaStreamTrackSourcesRequest& request) OVERRIDE;
|
| + const blink::WebMediaStreamTrackSourcesRequest& request) OVERRIDE;
|
|
|
| virtual void didEnableMediaStreamTrack(
|
| - const WebKit::WebMediaStream& stream,
|
| - const WebKit::WebMediaStreamTrack& component) OVERRIDE;
|
| + const blink::WebMediaStream& stream,
|
| + const blink::WebMediaStreamTrack& component) OVERRIDE;
|
|
|
| virtual void didDisableMediaStreamTrack(
|
| - const WebKit::WebMediaStream& stream,
|
| - const WebKit::WebMediaStreamTrack& component) OVERRIDE;
|
| + const blink::WebMediaStream& stream,
|
| + const blink::WebMediaStreamTrack& component) OVERRIDE;
|
|
|
| virtual void didStopLocalMediaStream(
|
| - const WebKit::WebMediaStream& stream) OVERRIDE;
|
| + const blink::WebMediaStream& stream) OVERRIDE;
|
|
|
| virtual bool didStopMediaStreamTrack(
|
| - const WebKit::WebMediaStreamTrack& web_track) OVERRIDE;
|
| + const blink::WebMediaStreamTrack& web_track) OVERRIDE;
|
|
|
| virtual void didCreateMediaStream(
|
| - WebKit::WebMediaStream& stream) OVERRIDE;
|
| + blink::WebMediaStream& stream) OVERRIDE;
|
|
|
| virtual bool didAddMediaStreamTrack(
|
| - const WebKit::WebMediaStream& stream,
|
| - const WebKit::WebMediaStreamTrack& track) OVERRIDE;
|
| + const blink::WebMediaStream& stream,
|
| + const blink::WebMediaStreamTrack& track) OVERRIDE;
|
|
|
| virtual bool didRemoveMediaStreamTrack(
|
| - const WebKit::WebMediaStream& stream,
|
| - const WebKit::WebMediaStreamTrack& track) OVERRIDE;
|
| + const blink::WebMediaStream& stream,
|
| + const blink::WebMediaStreamTrack& track) OVERRIDE;
|
|
|
| // RenderProcessObserver implementation.
|
| virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
|
| @@ -75,7 +75,7 @@ class CONTENT_EXPORT MediaStreamCenter
|
| // requests.
|
| int next_request_id_;
|
|
|
| - typedef std::map<int, WebKit::WebMediaStreamTrackSourcesRequest> RequestMap;
|
| + typedef std::map<int, blink::WebMediaStreamTrackSourcesRequest> RequestMap;
|
| // Maps request ids to request objects.
|
| RequestMap requests_;
|
|
|
|
|