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

Unified Diff: mojo/shell/runner/host/child_process_host.cc

Issue 1679573002: Move shell interfaces into the shell.mojom namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate
Patch Set: . Created 4 years, 10 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 | « mojo/shell/runner/host/child_process_host.h ('k') | mojo/shell/runner/host/in_process_native_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/runner/host/child_process_host.cc
diff --git a/mojo/shell/runner/host/child_process_host.cc b/mojo/shell/runner/host/child_process_host.cc
index 57e52351f85b6e918405b6336684e4c9ff4a5150..4e9fa9f164949347ba300667dd0a350039a189f4 100644
--- a/mojo/shell/runner/host/child_process_host.cc
+++ b/mojo/shell/runner/host/child_process_host.cc
@@ -88,7 +88,8 @@ ChildProcessHost::ChildProcessHost(ScopedHandle channel)
weak_factory_(this) {
CHECK(channel.is_valid());
ScopedMessagePipeHandle handle(MessagePipeHandle(channel.release().value()));
- controller_.Bind(InterfacePtrInfo<ChildController>(std::move(handle), 0u));
+ controller_.Bind(
+ InterfacePtrInfo<mojom::ChildController>(std::move(handle), 0u));
}
ChildProcessHost::~ChildProcessHost() {
@@ -138,7 +139,7 @@ int ChildProcessHost::Join() {
if (controller_) // We use this as a signal that Start was called.
start_child_process_event_.Wait();
- controller_ = ChildControllerPtr();
+ controller_ = mojom::ChildControllerPtr();
DCHECK(child_process_.IsValid());
// Ensure the child pipe is closed even if it wasn't yet connected to the
@@ -155,8 +156,8 @@ int ChildProcessHost::Join() {
}
void ChildProcessHost::StartApp(
- InterfaceRequest<Application> application_request,
- const ChildController::StartAppCallback& on_app_complete) {
+ InterfaceRequest<mojom::Application> application_request,
+ const mojom::ChildController::StartAppCallback& on_app_complete) {
DCHECK(controller_);
on_app_complete_ = on_app_complete;
@@ -287,7 +288,7 @@ void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) {
void ChildProcessHost::OnMessagePipeCreated() {
controller_.Bind(
- InterfacePtrInfo<ChildController>(pipe_holder_->PassPipe(), 0u));
+ InterfacePtrInfo<mojom::ChildController>(pipe_holder_->PassPipe(), 0u));
MaybeNotifyProcessReady();
}
« no previous file with comments | « mojo/shell/runner/host/child_process_host.h ('k') | mojo/shell/runner/host/in_process_native_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698