content/renderer/render_thread_impl.cc - Issue 14865012: Merge 191377 "Move webrtc behind flag(--enable-webrtc) for b..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_thread_impl.cc

Issue 14865012: Merge 191377 "Move webrtc behind flag(--enable-webrtc) for b..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/

Patch Set: add missing file Created 7 years, 7 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

Index: content/renderer/render_thread_impl.cc

===================================================================

--- content/renderer/render_thread_impl.cc (revision 198991)

+++ content/renderer/render_thread_impl.cc (working copy)

@@ -663,12 +663,12 @@

#endif

#if defined(OS_ANDROID)

- if (command_line.HasSwitch(switches::kDisableWebRTC))

+ if (!command_line.HasSwitch(switches::kEnableWebRTC))

WebRuntimeFeatures::enableMediaStream(false);

#endif

#if defined(OS_ANDROID)

- if (command_line.HasSwitch(switches::kDisableWebRTC))

+ if (!command_line.HasSwitch(switches::kEnableWebRTC))

WebRuntimeFeatures::enablePeerConnection(false);

#endif

@@ -1227,8 +1227,8 @@

WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter(

WebKit::WebMediaStreamCenterClient* client) {

#if defined(OS_ANDROID)

- if (CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisableWebRTC))

+ if (!CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kEnableWebRTC))

return NULL;

#endif

« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »