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

mojo/shell/application_instance.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/application_instance.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace shell {
 
 ApplicationInstance::ApplicationInstance(
-    mojom::ApplicationPtr application,
+    mojom::ShellClientPtr shell_client,
     ApplicationManager* manager,
     const Identity& identity,
     uint32_t requesting_content_handler_id,
     const base::Closure& on_application_end)
     : manager_(manager),
       id_(GenerateUniqueID()),
       identity_(identity),
       allow_any_application_(identity.filter().size() == 1 &&
                              identity.filter().count("*") == 1),
       requesting_content_handler_id_(requesting_content_handler_id),
       on_application_end_(on_application_end),
-      application_(std::move(application)),
+      shell_client_(std::move(shell_client)),
       binding_(this),
       pid_receiver_binding_(this),
       queue_requests_(false),
       native_runner_(nullptr),
       pid_(base::kNullProcessId) {
   DCHECK_NE(Shell::kInvalidApplicationID, id_);
 }
 
 ApplicationInstance::~ApplicationInstance() {
   for (auto request : queued_client_requests_) {
     request->connect_callback().Run(kInvalidApplicationID,
                                     kInvalidApplicationID);
   }
   STLDeleteElements(&queued_client_requests_);
 }
 
 void ApplicationInstance::InitializeApplication() {
-  application_->Initialize(binding_.CreateInterfacePtrAndBind(),
-                           identity_.url().spec(), id_);
+  shell_client_->Initialize(binding_.CreateInterfacePtrAndBind(),
+                            identity_.url().spec(), id_);
   binding_.set_connection_error_handler([this]() { OnConnectionError(); });
 }
 
 void ApplicationInstance::ConnectToClient(
     scoped_ptr<ConnectToApplicationParams> params) {
   if (queue_requests_) {
     queued_client_requests_.push_back(params.release());
     return;
   }
 
@@ skipping 42 matching lines @@
     manager_->ConnectToApplication(std::move(params));
   } else {
     LOG(WARNING) << "CapabilityFilter prevented connection from: " <<
         identity_.url() << " to: " << url.spec();
     callback.Run(kInvalidApplicationID, kInvalidApplicationID);
   }
 }
 
 void ApplicationInstance::QuitApplication() {
   queue_requests_ = true;
-  application_->OnQuitRequested(
+  shell_client_->OnQuitRequested(
       base::Bind(&ApplicationInstance::OnQuitRequestedResult,
                  base::Unretained(this)));
 }
 
 void ApplicationInstance::SetPID(uint32_t pid) {
   // This will call us back to update pid_.
   manager_->ApplicationPIDAvailable(id_, pid);
 }
 
 uint32_t ApplicationInstance::GenerateUniqueID() const {
   static uint32_t id = Shell::kInvalidApplicationID;
   ++id;
   CHECK_NE(Shell::kInvalidApplicationID, id);
   return id;
 }
 
 void ApplicationInstance::CallAcceptConnection(
     scoped_ptr<ConnectToApplicationParams> params) {
   params->connect_callback().Run(id_, requesting_content_handler_id_);
   AllowedInterfaces interfaces;
   interfaces.insert("*");
   if (!params->source().is_null())
     interfaces = GetAllowedInterfaces(params->source().filter(), identity_);
 
   ApplicationInstance* source =
       manager_->GetApplicationInstance(params->source());
   uint32_t source_id = source ? source->id() : Shell::kInvalidApplicationID;
-  application_->AcceptConnection(
+  shell_client_->AcceptConnection(
       params->source().url().spec(), source_id, params->TakeServices(),
       params->TakeExposedServices(), Array<String>::From(interfaces),
       params->target().url().spec());
 }
 
 void ApplicationInstance::OnConnectionError() {
   std::vector<ConnectToApplicationParams*> queued_client_requests;
   queued_client_requests_.swap(queued_client_requests);
   auto manager = manager_;
   manager_->OnApplicationInstanceError(this);
@@ skipping 35 matching lines @@
 
   queue_requests_ = false;
   for (auto request : queued_client_requests_)
     CallAcceptConnection(make_scoped_ptr(request));
 
   queued_client_requests_.clear();
 }
 
 }  // namespace shell
 }  // namespace mojo