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

Side by Side Diff: services/service_manager/runner/common/client_util.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 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/service_manager/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/service_manager/runner/common/switches.h"
12 12
13 namespace shell { 13 namespace shell {
14 14
15 mojom::ServicePtr PassServiceRequestOnCommandLine( 15 mojom::ServicePtr PassServiceRequestOnCommandLine(
16 base::CommandLine* command_line, const std::string& child_token) { 16 base::CommandLine* command_line, const std::string& child_token) {
17 std::string token = mojo::edk::GenerateRandomToken(); 17 std::string token = mojo::edk::GenerateRandomToken();
18 command_line->AppendSwitchASCII(switches::kPrimordialPipeToken, token); 18 command_line->AppendSwitchASCII(switches::kPrimordialPipeToken, token);
19 19
20 mojom::ServicePtr client; 20 mojom::ServicePtr client;
21 client.Bind( 21 client.Bind(
(...skipping 11 matching lines...) Expand all
33 request.Bind(mojo::edk::CreateChildMessagePipe(token)); 33 request.Bind(mojo::edk::CreateChildMessagePipe(token));
34 return request; 34 return request;
35 } 35 }
36 36
37 bool ShellIsRemote() { 37 bool ShellIsRemote() {
38 return base::CommandLine::ForCurrentProcess()->HasSwitch( 38 return base::CommandLine::ForCurrentProcess()->HasSwitch(
39 switches::kPrimordialPipeToken); 39 switches::kPrimordialPipeToken);
40 } 40 }
41 41
42 } // namespace shell 42 } // namespace shell
OLDNEW
« no previous file with comments | « services/service_manager/runner/common/client_util.h ('k') | services/service_manager/runner/common/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698