Chromium Code Reviews| Index: content/browser/frame_host/render_frame_host_impl.cc |
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
| index 1cbc21c45a3e545729ba08a44968c432bd7e456b..59ed5570da51365ddcbb018b58a4f7c041824114 100644 |
| --- a/content/browser/frame_host/render_frame_host_impl.cc |
| +++ b/content/browser/frame_host/render_frame_host_impl.cc |
| @@ -93,6 +93,7 @@ |
| #include "media/mojo/interfaces/media_service.mojom.h" |
| #include "media/mojo/interfaces/service_factory.mojom.h" |
| #include "mojo/public/cpp/bindings/associated_interface_ptr.h" |
| +#include "public/platform/modules/shapedetection/shapedetection.mojom.h" |
| #include "services/shell/public/cpp/connector.h" |
| #include "services/shell/public/cpp/interface_provider.h" |
| #include "ui/accessibility/ax_tree.h" |
| @@ -2160,10 +2161,15 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { |
| GetInterfaceRegistry()->AddInterface( |
| base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); |
| + GetInterfaceRegistry()->AddInterface( |
| + GetGlobalJavaInterfaces() |
| + ->CreateInterfaceFactory<blink::mojom::ShapeDetection>()); |
|
mcasas
2016/10/11 02:51:17
These 3 lines should be protected by a
#if define
xianglu
2016/10/11 20:25:50
Done.
|
| + |
| #if defined(OS_ANDROID) |
| GetInterfaceRegistry()->AddInterface( |
| GetGlobalJavaInterfaces() |
| ->CreateInterfaceFactory<device::VibrationManager>()); |
| + |
|
mcasas
2016/10/11 02:51:17
nit: No need for this extra space.
xianglu
2016/10/11 20:25:50
Done.
|
| #else |
| GetInterfaceRegistry()->AddInterface( |
| base::Bind(&device::VibrationManagerImpl::Create)); |