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/mojo/mojo_child_connection.h" | 5 #include "content/browser/mojo/mojo_child_connection.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "content/browser/mojo/constants.h" |
14 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/browser/render_process_host.h" | 16 #include "content/public/browser/render_process_host.h" |
16 #include "content/public/browser/render_process_host_observer.h" | 17 #include "content/public/browser/render_process_host_observer.h" |
17 #include "content/public/common/mojo_shell_connection.h" | 18 #include "content/public/common/mojo_shell_connection.h" |
18 #include "ipc/ipc_sender.h" | 19 #include "ipc/ipc_sender.h" |
19 #include "mojo/converters/network/network_type_converters.h" | 20 #include "mojo/converters/network/network_type_converters.h" |
20 #include "mojo/edk/embedder/embedder.h" | 21 #include "mojo/edk/embedder/embedder.h" |
21 #include "mojo/public/cpp/system/message_pipe.h" | 22 #include "mojo/public/cpp/system/message_pipe.h" |
22 #include "mojo/shell/public/cpp/connector.h" | 23 #include "mojo/shell/public/cpp/connector.h" |
23 #include "mojo/shell/public/interfaces/shell.mojom.h" | 24 #include "mojo/shell/public/interfaces/shell.mojom.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 | 104 |
104 mojo::shell::mojom::ShellClientPtr client; | 105 mojo::shell::mojom::ShellClientPtr client; |
105 client.Bind(mojo::InterfacePtrInfo<mojo::shell::mojom::ShellClient>( | 106 client.Bind(mojo::InterfacePtrInfo<mojo::shell::mojom::ShellClient>( |
106 std::move(shell_client_pipe), 0u)); | 107 std::move(shell_client_pipe), 0u)); |
107 mojo::shell::mojom::PIDReceiverPtr pid_receiver; | 108 mojo::shell::mojom::PIDReceiverPtr pid_receiver; |
108 mojo::shell::mojom::PIDReceiverRequest pid_receiver_request = | 109 mojo::shell::mojom::PIDReceiverRequest pid_receiver_request = |
109 GetProxy(&pid_receiver); | 110 GetProxy(&pid_receiver); |
110 // PIDSender manages its own lifetime. | 111 // PIDSender manages its own lifetime. |
111 new PIDSender(render_process_host, std::move(pid_receiver)); | 112 new PIDSender(render_process_host, std::move(pid_receiver)); |
112 | 113 |
113 | 114 mojo::Identity target(kRendererMojoApplicationName, |
114 mojo::Identity target("exe:chrome_renderer", | |
115 mojo::shell::mojom::kInheritUserID, | 115 mojo::shell::mojom::kInheritUserID, |
116 base::StringPrintf("%d_%d", child_process_id, | 116 base::StringPrintf("%d_%d", child_process_id, |
117 instance_id)); | 117 instance_id)); |
118 mojo::Connector::ConnectParams params(target); | 118 mojo::Connector::ConnectParams params(target); |
119 params.set_client_process_connection(std::move(client), | 119 params.set_client_process_connection(std::move(client), |
120 std::move(pid_receiver_request)); | 120 std::move(pid_receiver_request)); |
121 scoped_ptr<mojo::Connection> connection = | 121 scoped_ptr<mojo::Connection> connection = |
122 MojoShellConnection::Get()->GetConnector()->Connect(¶ms); | 122 MojoShellConnection::Get()->GetConnector()->Connect(¶ms); |
123 | 123 |
124 // Store the connection on the RPH so client code can access it later via | 124 // Store the connection on the RPH so client code can access it later via |
125 // GetMojoConnection(). | 125 // GetMojoConnection(). |
126 SetMojoConnection(render_process_host, std::move(connection)); | 126 SetMojoConnection(render_process_host, std::move(connection)); |
127 | 127 |
128 return pipe_token; | 128 return pipe_token; |
129 } | 129 } |
130 | 130 |
131 mojo::Connection* GetMojoConnection(RenderProcessHost* render_process_host) { | 131 mojo::Connection* GetMojoConnection(RenderProcessHost* render_process_host) { |
132 RenderProcessHostConnection* connection = | 132 RenderProcessHostConnection* connection = |
133 static_cast<RenderProcessHostConnection*>( | 133 static_cast<RenderProcessHostConnection*>( |
134 render_process_host->GetUserData(kMojoRenderProcessHostConnection)); | 134 render_process_host->GetUserData(kMojoRenderProcessHostConnection)); |
135 return connection ? connection->get() : nullptr; | 135 return connection ? connection->get() : nullptr; |
136 } | 136 } |
137 | 137 |
138 } // namespace content | 138 } // namespace content |
OLD | NEW |