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

Unified Diff: services/shell/runner/common/client_util.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/shell/runner/common/client_util.h ('k') | services/shell/runner/host/child_process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/runner/common/client_util.cc
diff --git a/services/shell/runner/common/client_util.cc b/services/shell/runner/common/client_util.cc
index 50e04fa17816536673ded5c3c8e3d543f0879cd9..9a79c0e88db11b40e8d14eda633fa1aebe05af09 100644
--- a/services/shell/runner/common/client_util.cc
+++ b/services/shell/runner/common/client_util.cc
@@ -10,17 +10,16 @@
#include "mojo/edk/embedder/embedder.h"
#include "services/shell/runner/common/switches.h"
-namespace mojo {
namespace shell {
mojom::ShellClientPtr PassShellClientRequestOnCommandLine(
base::CommandLine* command_line) {
- std::string token = edk::GenerateRandomToken();
+ std::string token = mojo::edk::GenerateRandomToken();
command_line->AppendSwitchASCII(switches::kPrimordialPipeToken, token);
mojom::ShellClientPtr client;
client.Bind(
- mojom::ShellClientPtrInfo(edk::CreateParentMessagePipe(token), 0));
+ mojom::ShellClientPtrInfo(mojo::edk::CreateParentMessagePipe(token), 0));
return client;
}
@@ -30,9 +29,8 @@ mojom::ShellClientRequest GetShellClientRequestFromCommandLine() {
switches::kPrimordialPipeToken);
mojom::ShellClientRequest request;
if (!token.empty())
- request.Bind(edk::CreateChildMessagePipe(token));
+ request.Bind(mojo::edk::CreateChildMessagePipe(token));
return request;
}
} // namespace shell
-} // namespace mojo
« no previous file with comments | « services/shell/runner/common/client_util.h ('k') | services/shell/runner/host/child_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698