OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/shell/runner/common/client_util.h" | 5 #include "services/shell/runner/common/client_util.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "mojo/edk/embedder/embedder.h" | 10 #include "mojo/edk/embedder/embedder.h" |
11 #include "services/shell/runner/common/switches.h" | 11 #include "services/shell/runner/common/switches.h" |
12 | 12 |
13 namespace mojo { | |
14 namespace shell { | 13 namespace shell { |
15 | 14 |
16 mojom::ShellClientPtr PassShellClientRequestOnCommandLine( | 15 mojom::ShellClientPtr PassShellClientRequestOnCommandLine( |
17 base::CommandLine* command_line) { | 16 base::CommandLine* command_line) { |
18 std::string token = edk::GenerateRandomToken(); | 17 std::string token = mojo::edk::GenerateRandomToken(); |
19 command_line->AppendSwitchASCII(switches::kPrimordialPipeToken, token); | 18 command_line->AppendSwitchASCII(switches::kPrimordialPipeToken, token); |
20 | 19 |
21 mojom::ShellClientPtr client; | 20 mojom::ShellClientPtr client; |
22 client.Bind( | 21 client.Bind( |
23 mojom::ShellClientPtrInfo(edk::CreateParentMessagePipe(token), 0)); | 22 mojom::ShellClientPtrInfo(mojo::edk::CreateParentMessagePipe(token), 0)); |
24 return client; | 23 return client; |
25 } | 24 } |
26 | 25 |
27 mojom::ShellClientRequest GetShellClientRequestFromCommandLine() { | 26 mojom::ShellClientRequest GetShellClientRequestFromCommandLine() { |
28 std::string token = | 27 std::string token = |
29 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 28 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
30 switches::kPrimordialPipeToken); | 29 switches::kPrimordialPipeToken); |
31 mojom::ShellClientRequest request; | 30 mojom::ShellClientRequest request; |
32 if (!token.empty()) | 31 if (!token.empty()) |
33 request.Bind(edk::CreateChildMessagePipe(token)); | 32 request.Bind(mojo::edk::CreateChildMessagePipe(token)); |
34 return request; | 33 return request; |
35 } | 34 } |
36 | 35 |
37 } // namespace shell | 36 } // namespace shell |
38 } // namespace mojo | |
OLD | NEW |