OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 2236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2247 | 2247 |
2248 mojo::shell::mojom::InterfaceProviderPtr exposed_services; | 2248 mojo::shell::mojom::InterfaceProviderPtr exposed_services; |
2249 service_registry_->Bind(GetProxy(&exposed_services)); | 2249 service_registry_->Bind(GetProxy(&exposed_services)); |
2250 | 2250 |
2251 mojo::shell::mojom::InterfaceProviderPtr services; | 2251 mojo::shell::mojom::InterfaceProviderPtr services; |
2252 setup->ExchangeInterfaceProviders(routing_id_, GetProxy(&services), | 2252 setup->ExchangeInterfaceProviders(routing_id_, GetProxy(&services), |
2253 std::move(exposed_services)); | 2253 std::move(exposed_services)); |
2254 service_registry_->BindRemoteServiceProvider(std::move(services)); | 2254 service_registry_->BindRemoteServiceProvider(std::move(services)); |
2255 | 2255 |
2256 #if defined(OS_ANDROID) | 2256 #if defined(OS_ANDROID) |
2257 service_registry_android_.reset( | 2257 service_registry_android_ = |
2258 new ServiceRegistryAndroid(service_registry_.get())); | 2258 ServiceRegistryAndroid::Create(service_registry_.get()); |
2259 ServiceRegistrarAndroid::RegisterFrameHostServices( | 2259 ServiceRegistrarAndroid::RegisterFrameHostServices( |
2260 service_registry_android_.get()); | 2260 service_registry_android_.get()); |
2261 #endif | 2261 #endif |
2262 } | 2262 } |
2263 | 2263 |
2264 void RenderFrameHostImpl::InvalidateMojoConnection() { | 2264 void RenderFrameHostImpl::InvalidateMojoConnection() { |
2265 #if defined(OS_ANDROID) | 2265 #if defined(OS_ANDROID) |
2266 // The Android-specific service registry has a reference to | 2266 // The Android-specific service registry has a reference to |
2267 // |service_registry_| and thus must be torn down first. | 2267 // |service_registry_| and thus must be torn down first. |
2268 service_registry_android_.reset(); | 2268 service_registry_android_.reset(); |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2743 } | 2743 } |
2744 | 2744 |
2745 void RenderFrameHostImpl::CreateWebBluetoothService( | 2745 void RenderFrameHostImpl::CreateWebBluetoothService( |
2746 blink::mojom::WebBluetoothServiceRequest request) { | 2746 blink::mojom::WebBluetoothServiceRequest request) { |
2747 DCHECK(!web_bluetooth_service_); | 2747 DCHECK(!web_bluetooth_service_); |
2748 web_bluetooth_service_.reset( | 2748 web_bluetooth_service_.reset( |
2749 new WebBluetoothServiceImpl(this, std::move(request))); | 2749 new WebBluetoothServiceImpl(this, std::move(request))); |
2750 } | 2750 } |
2751 | 2751 |
2752 } // namespace content | 2752 } // namespace content |
OLD | NEW |