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

mojo/shell/public/cpp/lib/application_runner.cc

 // Copyright 2014 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/public/cpp/application_runner.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
 #include "mojo/message_pump/message_pump_mojo.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
 
 namespace mojo {
 
 int g_application_runner_argc;
 const char* const* g_application_runner_argv;
 
 ApplicationRunner::ApplicationRunner(ShellClient* client)
     : client_(scoped_ptr<ShellClient>(client)),
       message_loop_type_(base::MessageLoop::TYPE_CUSTOM),
       has_run_(false) {}
 
 ApplicationRunner::~ApplicationRunner() {}
 
 void ApplicationRunner::InitBaseCommandLine() {
   base::CommandLine::Init(g_application_runner_argc, g_application_runner_argv);
 }
 
 void ApplicationRunner::set_message_loop_type(base::MessageLoop::Type type) {
   DCHECK_NE(base::MessageLoop::TYPE_CUSTOM, type);
   DCHECK(!has_run_);
 
   message_loop_type_ = type;
 }
 
-MojoResult ApplicationRunner::Run(MojoHandle application_request_handle,
+MojoResult ApplicationRunner::Run(MojoHandle shell_client_request_handle,
                                   bool init_base) {
   DCHECK(!has_run_);
   has_run_ = true;
 
   scoped_ptr<base::AtExitManager> at_exit;
   if (init_base) {
     InitBaseCommandLine();
     at_exit.reset(new base::AtExitManager);
   }
 
   {
     scoped_ptr<base::MessageLoop> loop;
     if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM)
       loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create()));
     else
       loop.reset(new base::MessageLoop(message_loop_type_));
 
-    ApplicationImpl impl(client_.get(),
-                         MakeRequest<shell::mojom::Application>(
+    ShellConnection impl(client_.get(),
+                         MakeRequest<shell::mojom::ShellClient>(
                             MakeScopedHandle(MessagePipeHandle(
-                                application_request_handle))));
+                                shell_client_request_handle))));
     loop->Run();
     // It's very common for the client to cache the app and terminate on errors.
     // If we don't delete the client before the app we run the risk of the
     // client having a stale reference to the app and trying to use it.
     // Note that we destruct the message loop first because that might trigger
     // connection error handlers and they might access objects created by the
     // client.
     loop.reset();
     client_.reset();
   }
   return MOJO_RESULT_OK;
 }
 
-MojoResult ApplicationRunner::Run(MojoHandle application_request_handle) {
-  return Run(application_request_handle, true);
+MojoResult ApplicationRunner::Run(MojoHandle shell_client_request_handle) {
+  return Run(shell_client_request_handle, true);
 }
 
 }  // namespace mojo