OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/frame_mojo_shell.h" | 5 #include "content/browser/frame_host/frame_mojo_shell.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "content/browser/mojo/mojo_shell_context.h" | 10 #include "content/browser/mojo/mojo_shell_context.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 connectors_.AddBinding(this, std::move(request)); | 44 connectors_.AddBinding(this, std::move(request)); |
45 } | 45 } |
46 | 46 |
47 // TODO(xhwang): Currently no callers are exposing |exposed_services|. So we | 47 // TODO(xhwang): Currently no callers are exposing |exposed_services|. So we |
48 // drop it and replace it with services we provide in the browser. In the | 48 // drop it and replace it with services we provide in the browser. In the |
49 // future we may need to support both. | 49 // future we may need to support both. |
50 void FrameMojoShell::Connect( | 50 void FrameMojoShell::Connect( |
51 mojo::shell::mojom::IdentityPtr target, | 51 mojo::shell::mojom::IdentityPtr target, |
52 mojo::shell::mojom::InterfaceProviderRequest services, | 52 mojo::shell::mojom::InterfaceProviderRequest services, |
53 mojo::shell::mojom::InterfaceProviderPtr /* exposed_services */, | 53 mojo::shell::mojom::InterfaceProviderPtr /* exposed_services */, |
| 54 mojo::shell::mojom::ClientProcessConnectionPtr client_process_connection, |
54 const mojo::shell::mojom::Connector::ConnectCallback& callback) { | 55 const mojo::shell::mojom::Connector::ConnectCallback& callback) { |
55 // TODO(beng): user_id is dropped on the floor right now. Figure out what to | 56 // TODO(beng): user_id is dropped on the floor right now. Figure out what to |
56 // do with it. | 57 // do with it. |
57 mojo::shell::mojom::InterfaceProviderPtr frame_services; | 58 mojo::shell::mojom::InterfaceProviderPtr frame_services; |
58 service_provider_bindings_.AddBinding(GetServiceRegistry(), | 59 service_provider_bindings_.AddBinding(GetServiceRegistry(), |
59 GetProxy(&frame_services)); | 60 GetProxy(&frame_services)); |
60 | 61 |
61 MojoShellContext::ConnectToApplication( | 62 MojoShellContext::ConnectToApplication( |
62 target->name, | 63 target->name, |
63 frame_host_->GetSiteInstance()->GetSiteURL().spec(), std::move(services), | 64 frame_host_->GetSiteInstance()->GetSiteURL().spec(), std::move(services), |
(...skipping 13 matching lines...) Expand all Loading... |
77 // different services for different apps for better isolation. | 78 // different services for different apps for better isolation. |
78 RegisterFrameMojoShellServices(service_registry_.get(), frame_host_); | 79 RegisterFrameMojoShellServices(service_registry_.get(), frame_host_); |
79 GetContentClient()->browser()->RegisterFrameMojoShellServices( | 80 GetContentClient()->browser()->RegisterFrameMojoShellServices( |
80 service_registry_.get(), frame_host_); | 81 service_registry_.get(), frame_host_); |
81 } | 82 } |
82 | 83 |
83 return service_registry_.get(); | 84 return service_registry_.get(); |
84 } | 85 } |
85 | 86 |
86 } // namespace content | 87 } // namespace content |
OLD | NEW |