| 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 2b211b4511f52a523581e026e33ba0523c759a5f..a18e7e89d217fd31ee81c933d663911aa65251a8 100644
|
| --- a/content/browser/service_manager/service_manager_context.cc
|
| +++ b/content/browser/service_manager/service_manager_context.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/single_thread_task_runner.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "content/browser/gpu/gpu_process_host.h"
|
| #include "content/browser/service_manager/merge_dictionary.h"
|
| #include "content/common/service_manager/service_manager_connection_impl.h"
|
| @@ -39,6 +40,8 @@
|
| #include "services/service_manager/runner/common/client_util.h"
|
| #include "services/service_manager/runner/host/in_process_native_runner.h"
|
| #include "services/service_manager/service_manager.h"
|
| +#include "services/shape_detection/public/interfaces/constants.mojom.h"
|
| +#include "services/shape_detection/shape_detection_service.h"
|
|
|
| namespace content {
|
|
|
| @@ -257,6 +260,16 @@ ServiceManagerContext::ServiceManagerContext() {
|
|
|
| ContentBrowserClient::StaticServiceMap services;
|
| GetContentClient()->browser()->RegisterInProcessServices(&services);
|
| + // Put Shape Detection Service in browser process for now. if we see crashes
|
| + // in the future, consider moving it to a utility process.
|
| +
|
| + // TODO(xianglu): The code below does not seem to register shape_detection
|
| + // service? browser_context.cc is where registration actually happens.
|
| + ServiceInfo shape_detection_info;
|
| + shape_detection_info.factory =
|
| + base::Bind(&shape_detection::CreateShapeDetectionService);
|
| + services.insert(std::make_pair(shape_detection::mojom::kServiceName,
|
| + shape_detection_info));
|
| for (const auto& entry : services) {
|
| ServiceManagerConnection::GetForProcess()->AddEmbeddedService(entry.first,
|
| entry.second);
|
|
|