| Index: content/renderer/render_view_impl.h
|
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
|
| index 4e7c94ca61454eeef773587acafcd67daa0240ff..7cf9feafd44b9fa8bc69f06c33b34eb378376ed1 100644
|
| --- a/content/renderer/render_view_impl.h
|
| +++ b/content/renderer/render_view_impl.h
|
| @@ -65,6 +65,7 @@ class GURL;
|
| class IntentsDispatcher;
|
| class JavaBridgeDispatcher;
|
| class LoadProgressTracker;
|
| +class MediaStreamDispatcher;
|
| class MediaStreamImpl;
|
| class NotificationProvider;
|
| class PepperDeviceTest;
|
| @@ -118,12 +119,15 @@ class WebImage;
|
| class WebMediaPlayer;
|
| class WebMediaPlayerClient;
|
| class WebMouseEvent;
|
| +class WebPeerConnectionHandler;
|
| +class WebPeerConnectionHandlerClient;
|
| class WebSpeechInputController;
|
| class WebSpeechInputListener;
|
| class WebStorageNamespace;
|
| class WebTouchEvent;
|
| class WebURLLoader;
|
| class WebURLRequest;
|
| +class WebUserMediaClient;
|
| struct WebFileChooserParams;
|
| struct WebFindOptions;
|
| struct WebMediaPlayerAction;
|
| @@ -197,11 +201,18 @@ class RenderViewImpl : public RenderWidget,
|
| send_content_state_immediately_ = value;
|
| }
|
|
|
| + MediaStreamDispatcher* media_stream_dispatcher() {
|
| + return media_stream_dispatcher_;
|
| + }
|
| +
|
| // Current P2PSocketDispatcher. Set to NULL if P2P API is disabled.
|
| content::P2PSocketDispatcher* p2p_socket_dispatcher() {
|
| return p2p_socket_dispatcher_;
|
| }
|
|
|
| + WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
|
| + WebKit::WebPeerConnectionHandlerClient* client);
|
| +
|
| // Functions to add and remove observers for this object.
|
| void AddObserver(content::RenderViewObserver* observer);
|
| void RemoveObserver(content::RenderViewObserver* observer);
|
| @@ -382,6 +393,7 @@ class RenderViewImpl : public RenderWidget,
|
| const WebKit::WebString& url,
|
| const WebKit::WebString& title);
|
| virtual WebKit::WebPageVisibilityState visibilityState() const;
|
| + virtual WebKit::WebUserMediaClient* userMediaClient();
|
|
|
| // WebKit::WebFrameClient implementation -------------------------------------
|
|
|
| @@ -865,6 +877,8 @@ class RenderViewImpl : public RenderWidget,
|
| // Check whether the preferred size has changed.
|
| void CheckPreferredSize();
|
|
|
| + void EnsureMediaStreamImpl();
|
| +
|
| // This callback is triggered when DownloadFavicon completes, either
|
| // succesfully or with a failure. See DownloadFavicon for more
|
| // details.
|
| @@ -1126,6 +1140,9 @@ class RenderViewImpl : public RenderWidget,
|
| // Device orientation dispatcher attached to this view; lazily initialized.
|
| DeviceOrientationDispatcher* device_orientation_dispatcher_;
|
|
|
| + // MediaStream dispatcher attached to this view; lazily initialized.
|
| + MediaStreamDispatcher* media_stream_dispatcher_;
|
| +
|
| // MediaStreamImpl attached to this view; lazily initialized.
|
| scoped_refptr<MediaStreamImpl> media_stream_impl_;
|
|
|
|
|