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

Unified Diff: services/shell/public/cpp/lib/connector_impl.cc

Issue 2118083002: ShellClient -> Service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus2
Patch Set: . Created 4 years, 5 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/public/cpp/lib/application_runner.cc ('k') | services/shell/public/cpp/lib/service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/public/cpp/lib/connector_impl.cc
diff --git a/services/shell/public/cpp/lib/connector_impl.cc b/services/shell/public/cpp/lib/connector_impl.cc
index a8ff8bf0c8579ea1d2d5faf55994db8aca160314..73c6723eb521534a0081b2c7f9771b94813b4f11 100644
--- a/services/shell/public/cpp/lib/connector_impl.cc
+++ b/services/shell/public/cpp/lib/connector_impl.cc
@@ -89,18 +89,18 @@ std::unique_ptr<Connection> ConnectorImpl::Connect(ConnectParams* params) {
registry->SetRemoteInterfaces(std::move(remote_interface_provider));
}
- mojom::ShellClientPtr shell_client;
+ mojom::ServicePtr service;
mojom::PIDReceiverRequest pid_receiver_request;
- params->TakeClientProcessConnection(&shell_client, &pid_receiver_request);
+ params->TakeClientProcessConnection(&service, &pid_receiver_request);
mojom::ClientProcessConnectionPtr client_process_connection;
- if (shell_client.is_bound() && pid_receiver_request.is_pending()) {
+ if (service.is_bound() && pid_receiver_request.is_pending()) {
client_process_connection = mojom::ClientProcessConnection::New();
- client_process_connection->shell_client =
- shell_client.PassInterface().PassHandle();
+ client_process_connection->service =
+ service.PassInterface().PassHandle();
client_process_connection->pid_receiver_request =
pid_receiver_request.PassMessagePipe();
- } else if (shell_client.is_bound() || pid_receiver_request.is_pending()) {
- NOTREACHED() << "If one of shell_client or pid_receiver_request is valid, "
+ } else if (service.is_bound() || pid_receiver_request.is_pending()) {
+ NOTREACHED() << "If one of service or pid_receiver_request is valid, "
<< "both must be valid.";
return std::move(registry);
}
« no previous file with comments | « services/shell/public/cpp/lib/application_runner.cc ('k') | services/shell/public/cpp/lib/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698