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

Unified Diff: content/browser/service_manager/service_manager_context.cc

Issue 2867213004: [Mojo Video Capture] Hook up video capture service behind a feature flag (Closed)
Patch Set: Rebase to May 19th Created 3 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/browser/service_manager/service_manager_context.cc
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index f13e9e69f67cfaf16d130932b5605d81aca68595..47532cf748daef47dcec28ba66a65a59a17a36fc 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/command_line.h"
+#include "base/feature_list.h"
#include "base/json/json_reader.h"
#include "base/lazy_instance.h"
#include "base/macros.h"
@@ -51,6 +52,8 @@
#include "services/service_manager/runner/common/client_util.h"
#include "services/service_manager/service_manager.h"
#include "services/shape_detection/public/interfaces/constants.mojom.h"
+#include "services/video_capture/public/cpp/constants.h"
+#include "services/video_capture/public/interfaces/constants.mojom.h"
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
@@ -363,6 +366,11 @@ ServiceManagerContext::ServiceManagerContext() {
std::make_pair(content::mojom::kNetworkServiceName,
base::ASCIIToUTF16("Network Service")));
}
+ if (base::FeatureList::IsEnabled(video_capture::kMojoVideoCapture)) {
+ unsandboxed_services.insert(
+ std::make_pair(video_capture::mojom::kServiceName,
+ base::ASCIIToUTF16("Video Capture Service")));
+ }
for (const auto& service : unsandboxed_services) {
packaged_services_connection_->AddServiceRequestHandler(
« no previous file with comments | « content/browser/renderer_host/media/video_capture_provider_switcher.cc ('k') | content/browser/utility_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698