Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2766263009: Convert content ConnectionFilter to OnBindInterface (Closed)
Patch Set: . Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2863 matching lines...) Expand 10 before | Expand all | Expand 10 after
2874 BrowserContext::GetServiceManagerConnectionFor( 2874 BrowserContext::GetServiceManagerConnectionFor(
2875 GetProcess()->GetBrowserContext()); 2875 GetProcess()->GetBrowserContext());
2876 // |service_manager_connection| may not be set in unit tests using 2876 // |service_manager_connection| may not be set in unit tests using
2877 // TestBrowserContext. 2877 // TestBrowserContext.
2878 if (service_manager_connection) { 2878 if (service_manager_connection) {
2879 on_connect_handler_id_ = service_manager_connection->AddOnConnectHandler( 2879 on_connect_handler_id_ = service_manager_connection->AddOnConnectHandler(
2880 base::Bind(&RenderFrameHostImpl::OnRendererConnect, 2880 base::Bind(&RenderFrameHostImpl::OnRendererConnect,
2881 weak_ptr_factory_.GetWeakPtr())); 2881 weak_ptr_factory_.GetWeakPtr()));
2882 } 2882 }
2883 2883
2884 if (!GetProcess()->GetRemoteInterfaces())
2885 return;
2886
2887 RegisterMojoInterfaces(); 2884 RegisterMojoInterfaces();
2888 mojom::FrameFactoryPtr frame_factory; 2885 mojom::FrameFactoryPtr frame_factory;
2889 GetProcess()->GetRemoteInterfaces()->GetInterface(&frame_factory); 2886 BindInterface(GetProcess(), &frame_factory);
2890 frame_factory->CreateFrame(routing_id_, MakeRequest(&frame_), 2887 frame_factory->CreateFrame(routing_id_, MakeRequest(&frame_),
2891 frame_host_binding_.CreateInterfacePtrAndBind()); 2888 frame_host_binding_.CreateInterfacePtrAndBind());
2892 2889
2893 service_manager::mojom::InterfaceProviderPtr remote_interfaces; 2890 service_manager::mojom::InterfaceProviderPtr remote_interfaces;
2894 service_manager::mojom::InterfaceProviderRequest remote_interfaces_request( 2891 service_manager::mojom::InterfaceProviderRequest remote_interfaces_request(
2895 &remote_interfaces); 2892 &remote_interfaces);
2896 remote_interfaces_.reset(new service_manager::InterfaceProvider); 2893 remote_interfaces_.reset(new service_manager::InterfaceProvider);
2897 remote_interfaces_->Bind(std::move(remote_interfaces)); 2894 remote_interfaces_->Bind(std::move(remote_interfaces));
2898 frame_->GetInterfaceProvider(std::move(remote_interfaces_request)); 2895 frame_->GetInterfaceProvider(std::move(remote_interfaces_request));
2899 } 2896 }
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
3630 service_manager::mojom::InterfaceProviderPtr provider; 3627 service_manager::mojom::InterfaceProviderPtr provider;
3631 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); 3628 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3632 java_interfaces_.reset(new service_manager::InterfaceProvider); 3629 java_interfaces_.reset(new service_manager::InterfaceProvider);
3633 java_interfaces_->Bind(std::move(provider)); 3630 java_interfaces_->Bind(std::move(provider));
3634 } 3631 }
3635 return java_interfaces_.get(); 3632 return java_interfaces_.get();
3636 } 3633 }
3637 #endif 3634 #endif
3638 3635
3639 } // namespace content 3636 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/dom_storage/local_storage_context_mojo.cc ('k') | content/browser/gpu/gpu_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698