| 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 2265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2276 | 2276 |
| 2277 shell::mojom::InterfaceProviderPtr services; | 2277 shell::mojom::InterfaceProviderPtr services; |
| 2278 setup->ExchangeInterfaceProviders(routing_id_, GetProxy(&services), | 2278 setup->ExchangeInterfaceProviders(routing_id_, GetProxy(&services), |
| 2279 std::move(exposed_services)); | 2279 std::move(exposed_services)); |
| 2280 service_registry_->BindRemoteServiceProvider(std::move(services)); | 2280 service_registry_->BindRemoteServiceProvider(std::move(services)); |
| 2281 | 2281 |
| 2282 #if defined(OS_ANDROID) | 2282 #if defined(OS_ANDROID) |
| 2283 service_registry_android_ = | 2283 service_registry_android_ = |
| 2284 ServiceRegistryAndroid::Create(service_registry_.get()); | 2284 ServiceRegistryAndroid::Create(service_registry_.get()); |
| 2285 ServiceRegistrarAndroid::RegisterFrameHostServices( | 2285 ServiceRegistrarAndroid::RegisterFrameHostServices( |
| 2286 service_registry_android_.get()); | 2286 service_registry_android_.get(), this); |
| 2287 #endif | 2287 #endif |
| 2288 } | 2288 } |
| 2289 | 2289 |
| 2290 void RenderFrameHostImpl::InvalidateMojoConnection() { | 2290 void RenderFrameHostImpl::InvalidateMojoConnection() { |
| 2291 #if defined(OS_ANDROID) | 2291 #if defined(OS_ANDROID) |
| 2292 // The Android-specific service registry has a reference to | 2292 // The Android-specific service registry has a reference to |
| 2293 // |service_registry_| and thus must be torn down first. | 2293 // |service_registry_| and thus must be torn down first. |
| 2294 service_registry_android_.reset(); | 2294 service_registry_android_.reset(); |
| 2295 #endif | 2295 #endif |
| 2296 | 2296 |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2771 // handler after it's destroyed so it can't run after the RFHI is destroyed. | 2771 // handler after it's destroyed so it can't run after the RFHI is destroyed. |
| 2772 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 2772 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
| 2773 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 2773 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
| 2774 } | 2774 } |
| 2775 | 2775 |
| 2776 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 2776 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
| 2777 web_bluetooth_service_.reset(); | 2777 web_bluetooth_service_.reset(); |
| 2778 } | 2778 } |
| 2779 | 2779 |
| 2780 } // namespace content | 2780 } // namespace content |
| OLD | NEW |