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

Unified Diff: shell/child_process_host.cc

Issue 1067173003: Remove mojo:: part of mojo::shell:: nested namespace in //shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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
Index: shell/child_process_host.cc
diff --git a/shell/child_process_host.cc b/shell/child_process_host.cc
index acab25da0ed64bbd98fe3b9eb15fd9c1164d6194..f5d0a42ea38d43b59b582b8d259748401db767ab 100644
--- a/shell/child_process_host.cc
+++ b/shell/child_process_host.cc
@@ -22,7 +22,6 @@
#include "shell/switches.h"
#include "shell/task_runners.h"
-namespace mojo {
namespace shell {
ChildProcessHost::ChildProcessHost(Context* context)
@@ -36,7 +35,7 @@ ChildProcessHost::~ChildProcessHost() {
void ChildProcessHost::Start() {
DCHECK(!child_process_.IsValid());
- ScopedMessagePipeHandle handle(embedder::CreateChannel(
+ mojo::ScopedMessagePipeHandle handle(mojo::embedder::CreateChannel(
platform_channel_pair_.PassServerHandle(),
context_->task_runners()->io_runner(),
base::Bind(&ChildProcessHost::DidCreateChannel, base::Unretained(this)),
@@ -61,9 +60,9 @@ int ChildProcessHost::Join() {
}
void ChildProcessHost::StartApp(
- const String& app_path,
+ const mojo::String& app_path,
bool clean_app_path,
- InterfaceRequest<Application> application_request,
+ mojo::InterfaceRequest<mojo::Application> application_request,
const ChildController::StartAppCallback& on_app_complete) {
DCHECK(controller_);
@@ -89,8 +88,9 @@ void ChildProcessHost::DidStart(bool success) {
}
}
-// Callback for |embedder::CreateChannel()|.
-void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) {
+// Callback for |mojo::embedder::CreateChannel()|.
+void ChildProcessHost::DidCreateChannel(
+ mojo::embedder::ChannelInfo* channel_info) {
DVLOG(2) << "ChildProcessHost::DidCreateChannel()";
CHECK(channel_info);
@@ -108,7 +108,7 @@ bool ChildProcessHost::DoLaunch() {
arraysize(kForwardSwitches));
child_command_line.AppendSwitch(switches::kChildProcess);
- embedder::HandlePassingInformation handle_passing_info;
+ mojo::embedder::HandlePassingInformation handle_passing_info;
platform_channel_pair_.PrepareToPassClientHandleToChildProcess(
&child_command_line, &handle_passing_info);
@@ -137,4 +137,3 @@ void ChildProcessHost::OnConnectionError() {
}
} // namespace shell
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698