| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 3847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3858 static_cast<RenderFrameHostAndroid*>( | 3858 static_cast<RenderFrameHostAndroid*>( |
| 3859 GetUserData(kRenderFrameHostAndroidKey)); | 3859 GetUserData(kRenderFrameHostAndroidKey)); |
| 3860 if (!render_frame_host_android) { | 3860 if (!render_frame_host_android) { |
| 3861 service_manager::mojom::InterfaceProviderPtr interface_provider_ptr; | 3861 service_manager::mojom::InterfaceProviderPtr interface_provider_ptr; |
| 3862 java_interface_registry_ = base::MakeUnique<JavaInterfaceProvider>( | 3862 java_interface_registry_ = base::MakeUnique<JavaInterfaceProvider>( |
| 3863 base::Bind(&RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame, | 3863 base::Bind(&RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame, |
| 3864 weak_ptr_factory_.GetWeakPtr()), | 3864 weak_ptr_factory_.GetWeakPtr()), |
| 3865 mojo::MakeRequest(&interface_provider_ptr)); | 3865 mojo::MakeRequest(&interface_provider_ptr)); |
| 3866 render_frame_host_android = | 3866 render_frame_host_android = |
| 3867 new RenderFrameHostAndroid(this, std::move(interface_provider_ptr)); | 3867 new RenderFrameHostAndroid(this, std::move(interface_provider_ptr)); |
| 3868 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android); | 3868 SetUserData(kRenderFrameHostAndroidKey, |
| 3869 base::WrapUnique(render_frame_host_android)); |
| 3869 } | 3870 } |
| 3870 return render_frame_host_android->GetJavaObject(); | 3871 return render_frame_host_android->GetJavaObject(); |
| 3871 } | 3872 } |
| 3872 | 3873 |
| 3873 service_manager::InterfaceProvider* RenderFrameHostImpl::GetJavaInterfaces() { | 3874 service_manager::InterfaceProvider* RenderFrameHostImpl::GetJavaInterfaces() { |
| 3874 if (!java_interfaces_) { | 3875 if (!java_interfaces_) { |
| 3875 service_manager::mojom::InterfaceProviderPtr provider; | 3876 service_manager::mojom::InterfaceProviderPtr provider; |
| 3876 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); | 3877 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); |
| 3877 java_interfaces_.reset(new service_manager::InterfaceProvider); | 3878 java_interfaces_.reset(new service_manager::InterfaceProvider); |
| 3878 java_interfaces_->Bind(std::move(provider)); | 3879 java_interfaces_->Bind(std::move(provider)); |
| 3879 } | 3880 } |
| 3880 return java_interfaces_.get(); | 3881 return java_interfaces_.get(); |
| 3881 } | 3882 } |
| 3882 | 3883 |
| 3883 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 3884 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
| 3884 const std::string& interface_name, | 3885 const std::string& interface_name, |
| 3885 mojo::ScopedMessagePipeHandle pipe) { | 3886 mojo::ScopedMessagePipeHandle pipe) { |
| 3886 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 3887 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
| 3887 } | 3888 } |
| 3888 #endif | 3889 #endif |
| 3889 | 3890 |
| 3890 } // namespace content | 3891 } // namespace content |
| OLD | NEW |