diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 23:44:59 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 23:44:59 +0000 |
| commit | 7082fb94c43096c1967291e672d3ddb690fecac3 (patch) | |
| tree | df8b888401e564665ec114640674e73836489b2c /content/renderer/render_thread_impl.cc | |
| parent | 1266ba494530a267ec8a21442ea1b5cae94da4fb (diff) | |
| download | chromium_src-7082fb94c43096c1967291e672d3ddb690fecac3.zip chromium_src-7082fb94c43096c1967291e672d3ddb690fecac3.tar.gz chromium_src-7082fb94c43096c1967291e672d3ddb690fecac3.tar.bz2 | |
reland http://codereview.chromium.org/10379003/
enable media stream by default.
BUG=124790
TEST=local preview works without --enable-media-stream and remote view won't show without --enable-peer-connection.
Review URL: https://chromiumcodereview.appspot.com/10391157
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.cc')
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index dae9cd0..fe87a52 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -527,8 +527,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() { WebRuntimeFeatures::enableMediaPlayer( media::IsMediaLibraryInitialized()); - WebKit::WebRuntimeFeatures::enableMediaStream( - command_line.HasSwitch(switches::kEnableMediaStream)); + WebKit::WebRuntimeFeatures::enableMediaStream(true); WebKit::WebRuntimeFeatures::enablePeerConnection( command_line.HasSwitch(switches::kEnablePeerConnection)); @@ -922,10 +921,6 @@ GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( WebKit::WebMediaStreamCenterClient* client) { #if defined(ENABLE_WEBRTC) - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableMediaStream)) { - return NULL; - } if (!media_stream_center_) media_stream_center_ = new content::MediaStreamCenter(client); #endif |