ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/shell/runner/child/runner_connection.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/shell/runner/child/runner_connection.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 54 matching lines @@
   Unblocker GetUnblocker() { return Unblocker(this); }
 
  private:
   base::WaitableEvent event_;
   base::Closure run_after_;
 
   DISALLOW_COPY_AND_ASSIGN(Blocker);
 };
 
 using GotApplicationRequestCallback =
-    base::Callback<void(InterfaceRequest<mojom::Application>)>;
+    base::Callback<void(InterfaceRequest<mojom::ShellClient>)>;
 
 void OnCreateMessagePipe(ScopedMessagePipeHandle* result,
                          Blocker::Unblocker unblocker,
                          ScopedMessagePipeHandle pipe) {
   *result = std::move(pipe);
   unblocker.Unblock(base::Bind(&base::DoNothing));
 }
 
-void OnGotApplicationRequest(InterfaceRequest<mojom::Application>* out_request,
-                             InterfaceRequest<mojom::Application> request) {
+void OnGotApplicationRequest(InterfaceRequest<mojom::ShellClient>* out_request,
+                             InterfaceRequest<mojom::ShellClient> request) {
   *out_request = std::move(request);
 }
 
 class ChildControllerImpl;
 
 class RunnerConnectionImpl : public RunnerConnection {
  public:
   RunnerConnectionImpl() : controller_thread_("controller_thread") {
     StartControllerThread();
   }
   ~RunnerConnectionImpl() override {
     controller_runner_->PostTask(
         FROM_HERE, base::Bind(&RunnerConnectionImpl::ShutdownOnControllerThread,
                               base::Unretained(this)));
     controller_thread_.Stop();
   }
 
   // Returns true if a connection to the runner has been established and
   // |request| has been modified, false if no connection was established.
-  bool WaitForApplicationRequest(InterfaceRequest<mojom::Application>* request,
+  bool WaitForApplicationRequest(InterfaceRequest<mojom::ShellClient>* request,
                                  ScopedMessagePipeHandle handle);
 
   ChildControllerImpl* controller() const { return controller_.get(); }
 
   void set_controller(scoped_ptr<ChildControllerImpl> controller) {
     controller_ = std::move(controller);
   }
 
  private:
   void StartControllerThread() {
@@ skipping 50 matching lines @@
   }
 
   void OnConnectionError() {
     // A connection error means the connection to the shell is lost. This is not
     // recoverable.
     DLOG(ERROR) << "Connection error to the shell.";
     _exit(1);
   }
 
   // |mojom::ChildController| methods:
-  void StartApp(InterfaceRequest<mojom::Application> application_request,
+  void StartApp(InterfaceRequest<mojom::ShellClient> request,
                 const StartAppCallback& on_app_complete) override {
     DCHECK(thread_checker_.CalledOnValidThread());
 
     on_app_complete_ = on_app_complete;
     unblocker_.Unblock(
         base::Bind(&ChildControllerImpl::ReturnApplicationRequestOnMainThread,
-                   callback_, base::Passed(&application_request)));
+                   callback_, base::Passed(&request)));
   }
 
   void ExitNow(int32_t exit_code) override {
     DVLOG(2) << "ChildControllerImpl::ExitNow(" << exit_code << ")";
     _exit(exit_code);
   }
 
  private:
   ChildControllerImpl(RunnerConnectionImpl* connection,
                       const GotApplicationRequestCallback& callback,
                       const Blocker::Unblocker& unblocker)
       : connection_(connection),
         callback_(callback),
         unblocker_(unblocker),
         binding_(this) {}
 
   static void ReturnApplicationRequestOnMainThread(
       const GotApplicationRequestCallback& callback,
-      InterfaceRequest<mojom::Application> application_request) {
-    callback.Run(std::move(application_request));
+      InterfaceRequest<mojom::ShellClient> request) {
+    callback.Run(std::move(request));
   }
 
   base::ThreadChecker thread_checker_;
   RunnerConnectionImpl* const connection_;
   GotApplicationRequestCallback callback_;
   Blocker::Unblocker unblocker_;
   StartAppCallback on_app_complete_;
 
   Binding<ChildController> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildControllerImpl);
 };
 
 bool RunnerConnectionImpl::WaitForApplicationRequest(
-    InterfaceRequest<mojom::Application>* request,
+    InterfaceRequest<mojom::ShellClient>* request,
     ScopedMessagePipeHandle handle) {
   // If a valid message pipe to the runner was not provided, look for one on the
   // command line.
   if (!handle.is_valid()) {
     edk::ScopedPlatformHandle platform_channel =
         edk::PlatformChannelPair::PassClientHandleFromParentProcess(
             *base::CommandLine::ForCurrentProcess());
     if (!platform_channel.is_valid())
       return false;
     edk::SetParentPipeHandle(std::move(platform_channel));
@@ skipping 19 matching lines @@
 
   return true;
 }
 
 }  // namespace
 
 RunnerConnection::~RunnerConnection() {}
 
 // static
 RunnerConnection* RunnerConnection::ConnectToRunner(
-    InterfaceRequest<mojom::Application>* request,
+    InterfaceRequest<mojom::ShellClient>* request,
     ScopedMessagePipeHandle handle) {
   RunnerConnectionImpl* connection = new RunnerConnectionImpl;
   if (!connection->WaitForApplicationRequest(request, std::move(handle))) {
     delete connection;
     return nullptr;
   }
   return connection;
 }
 
 RunnerConnection::RunnerConnection() {}
 
 }  // namespace shell
 }  // namespace mojo