Index: content/renderer/render_view_impl.h |
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
index b04e3f7e42bd761d51ac330058187f4b83d2a3fb..b534393e4abb2c5ec94da9d5c8f6fa33ca5b6412 100644 |
--- a/content/renderer/render_view_impl.h |
+++ b/content/renderer/render_view_impl.h |
@@ -64,6 +64,7 @@ class GeolocationDispatcher; |
class GURL; |
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; |
@@ -198,11 +202,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); |
@@ -383,6 +394,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 ------------------------------------- |
@@ -868,6 +880,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. |
@@ -1129,6 +1143,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_; |