Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2676)

Unified Diff: content/renderer/render_view_impl.h

Issue 8060055: Adding support for MediaStream and PeerConnection functionality (Closed) Base URL: http://git.chromium.org/chromium/chromium.git@trunk
Patch Set: Merge Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/p2p/socket_dispatcher.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « content/renderer/p2p/socket_dispatcher.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698