Index: content/browser/BUILD.gn |
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn |
index 172ece03fe9f5621a6eb2467029d95bf4dbd1962..0f0d541f9142b3f900f5a96ef3dc4983e817d2a6 100644 |
--- a/content/browser/BUILD.gn |
+++ b/content/browser/BUILD.gn |
@@ -11,12 +11,6 @@ import("//printing/features/features.gni") |
import("//third_party/WebKit/public/public_features.gni") |
import("//tools/ipc_fuzzer/ipc_fuzzer.gni") |
-declare_args() { |
- # Include code in the build that is only needed when using the video |
- # capture Mojo service, which is currently experimental. |
- enable_mojo_video_capture = false |
-} |
- |
source_set("browser") { |
# Only the public target should depend on this. All other targets (even |
# internal content ones) should depend on the public one. |
@@ -128,6 +122,8 @@ source_set("browser") { |
"//services/shape_detection/public/interfaces", |
"//services/ui/gpu/interfaces", |
"//services/ui/public/cpp/gpu", |
+ "//services/video_capture/public/cpp", |
+ "//services/video_capture/public/interfaces:constants", |
"//skia", |
"//sql", |
"//storage/browser", |
@@ -1223,6 +1219,12 @@ source_set("browser") { |
"renderer_host/media/renderer_audio_output_stream_factory_context.h", |
"renderer_host/media/renderer_audio_output_stream_factory_context_impl.cc", |
"renderer_host/media/renderer_audio_output_stream_factory_context_impl.h", |
+ "renderer_host/media/service_launched_video_capture_device.cc", |
+ "renderer_host/media/service_launched_video_capture_device.h", |
+ "renderer_host/media/service_video_capture_device_launcher.cc", |
+ "renderer_host/media/service_video_capture_device_launcher.h", |
+ "renderer_host/media/service_video_capture_provider.cc", |
+ "renderer_host/media/service_video_capture_provider.h", |
"renderer_host/media/video_capture_controller.cc", |
"renderer_host/media/video_capture_controller.h", |
"renderer_host/media/video_capture_controller_event_handler.h", |
@@ -1234,6 +1236,8 @@ source_set("browser") { |
"renderer_host/media/video_capture_manager.cc", |
"renderer_host/media/video_capture_manager.h", |
"renderer_host/media/video_capture_provider.h", |
+ "renderer_host/media/video_capture_provider_switcher.cc", |
+ "renderer_host/media/video_capture_provider_switcher.h", |
"renderer_host/native_web_keyboard_event_aura.cc", |
"renderer_host/native_web_keyboard_event_mac.mm", |
"renderer_host/offscreen_canvas_provider_impl.cc", |
@@ -1613,22 +1617,6 @@ source_set("browser") { |
] |
} |
- if (enable_mojo_video_capture) { |
- sources += [ |
- "renderer_host/media/service_launched_video_capture_device.cc", |
- "renderer_host/media/service_launched_video_capture_device.h", |
- "renderer_host/media/service_video_capture_device_launcher.cc", |
- "renderer_host/media/service_video_capture_device_launcher.h", |
- "renderer_host/media/service_video_capture_provider.cc", |
- "renderer_host/media/service_video_capture_provider.h", |
- ] |
- |
- deps += [ |
- "//services/video_capture/public/cpp", |
- "//services/video_capture/public/interfaces:constants", |
- ] |
- } |
- |
# Desktop screen capture implementations, conditionally built depending on |
# the available implementations for each platform. |
if (is_linux || is_mac || is_win) { |