content/browser/renderer_host/media/video_capture_manager.cc - Issue 12563002: x11: Include X11 dependencies only when building with X11.

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/browser/renderer_host/media/video_capture_manager.cc

Issue 12563002: x11: Include X11 dependencies only when building with X11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 7 years, 9 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:

Index: content/browser/renderer_host/media/video_capture_manager.cc

diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc

index a2d3c69f42d1ebec4318ed9c8e35cd2127660c7e..837712d1bdc0f53c504e5249945f8d17877a17c0 100644

--- a/content/browser/renderer_host/media/video_capture_manager.cc

+++ b/content/browser/renderer_host/media/video_capture_manager.cc

@@ -178,7 +178,8 @@ void VideoCaptureManager::OnOpen(int capture_session_id,

break;

}

case MEDIA_SCREEN_VIDEO_CAPTURE: {

-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)

+#if (defined(OS_LINUX) && defined(USE_X11)) || \

+ defined(OS_MACOSX) || defined(OS_WIN)

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

switches::kEnableUserMediaScreenCapturing));

scoped_refptr<base::SequencedWorkerPool> blocking_pool =

« no previous file with comments | « build/linux/system.gyp ('k') | content/content_browser.gypi » ('j') | no next file with comments »