Land change for grunell@: "Adding support for MediaStream and PeerConnection functionality. "

Original review: http://codereview.chromium.org/8060055/

TBR=darin, scherkus
Review URL: http://codereview.chromium.org/8691003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111773 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 0 deletions

diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index af3e977..f70954c5 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;
@@ -116,12 +117,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);
@@ -390,6 +401,7 @@ class RenderViewImpl : public RenderWidget,
                              const WebKit::WebString& type,
                              const WebKit::WebString& data,
                              int intent_id);
+  virtual WebKit::WebUserMediaClient* userMediaClient();
 
   // WebKit::WebFrameClient implementation -------------------------------------
 
@@ -867,6 +879,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.
@@ -1142,6 +1156,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_;