Index: content/renderer/render_view_impl.h |
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
index 54dbb1b97222cbbace0f21e075f105881257c9dd..c92694c381242d5fbebd502f26487194794fe33d 100644 |
--- a/content/renderer/render_view_impl.h |
+++ b/content/renderer/render_view_impl.h |
@@ -63,6 +63,7 @@ class GURL; |
class IntentsDispatcher; |
class JavaBridgeDispatcher; |
class LoadProgressTracker; |
+class MediaStreamDispatcher; |
class MediaStreamImpl; |
class NotificationProvider; |
class PepperDeviceTest; |
@@ -131,12 +132,15 @@ class WebKeyboardEvent; |
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; |
@@ -204,6 +208,10 @@ class RenderViewImpl : public RenderWidget, |
int history_list_offset() const { return history_list_offset_; } |
+ MediaStreamDispatcher* media_stream_dispatcher() { |
darin (slow to review)
2011/11/17 18:04:02
nit: can you move this down nearby the p2p_socket_
Henrik Grunell
2011/11/18 16:05:21
Done.
|
+ return media_stream_dispatcher_; |
+ } |
+ |
const WebPreferences& webkit_preferences() const { |
return webkit_preferences_; |
} |
@@ -217,6 +225,9 @@ class RenderViewImpl : public RenderWidget, |
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); |
@@ -405,6 +416,7 @@ class RenderViewImpl : public RenderWidget, |
const WebKit::WebString& type, |
const WebKit::WebString& data, |
int intent_id); |
+ virtual WebKit::WebUserMediaClient* userMediaClient(); |
// WebKit::WebFrameClient implementation ------------------------------------- |
@@ -1151,6 +1163,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_; |