| 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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 IPC::ChannelProxy* channel = GetProcess()->GetChannel(); | 518 IPC::ChannelProxy* channel = GetProcess()->GetChannel(); |
| 519 if (channel) { | 519 if (channel) { |
| 520 RenderProcessHostImpl* process = | 520 RenderProcessHostImpl* process = |
| 521 static_cast<RenderProcessHostImpl*>(GetProcess()); | 521 static_cast<RenderProcessHostImpl*>(GetProcess()); |
| 522 process->GetRemoteRouteProvider()->GetRoute( | 522 process->GetRemoteRouteProvider()->GetRoute( |
| 523 GetRoutingID(), | 523 GetRoutingID(), |
| 524 mojo::GetProxy(&remote_interfaces, channel->GetAssociatedGroup())); | 524 mojo::GetProxy(&remote_interfaces, channel->GetAssociatedGroup())); |
| 525 } else { | 525 } else { |
| 526 // The channel may not be initialized in some tests environments. In this | 526 // The channel may not be initialized in some tests environments. In this |
| 527 // case we set up a dummy interface provider. | 527 // case we set up a dummy interface provider. |
| 528 mojo::GetDummyProxyForTesting(&remote_interfaces); | 528 mojo::GetIsolatedProxy(&remote_interfaces); |
| 529 } | 529 } |
| 530 remote_associated_interfaces_.reset(new AssociatedInterfaceProviderImpl( | 530 remote_associated_interfaces_.reset(new AssociatedInterfaceProviderImpl( |
| 531 std::move(remote_interfaces))); | 531 std::move(remote_interfaces))); |
| 532 } | 532 } |
| 533 return remote_associated_interfaces_.get(); | 533 return remote_associated_interfaces_.get(); |
| 534 } | 534 } |
| 535 | 535 |
| 536 #if defined(OS_ANDROID) | 536 #if defined(OS_ANDROID) |
| 537 scoped_refptr<AppWebMessagePortMessageFilter> | 537 scoped_refptr<AppWebMessagePortMessageFilter> |
| 538 RenderFrameHostImpl::GetAppWebMessagePortMessageFilter(int routing_id) { | 538 RenderFrameHostImpl::GetAppWebMessagePortMessageFilter(int routing_id) { |
| (...skipping 2614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3153 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3153 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
| 3154 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3154 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
| 3155 return web_bluetooth_service_.get(); | 3155 return web_bluetooth_service_.get(); |
| 3156 } | 3156 } |
| 3157 | 3157 |
| 3158 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3158 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
| 3159 web_bluetooth_service_.reset(); | 3159 web_bluetooth_service_.reset(); |
| 3160 } | 3160 } |
| 3161 | 3161 |
| 3162 } // namespace content | 3162 } // namespace content |
| OLD | NEW |