| Index: mojo/shell/public/cpp/lib/shell_connection.cc
|
| diff --git a/mojo/shell/public/cpp/lib/shell_connection.cc b/mojo/shell/public/cpp/lib/shell_connection.cc
|
| deleted file mode 100644
|
| index 62ae598222c360c3c9e78c70d816007505326dc8..0000000000000000000000000000000000000000
|
| --- a/mojo/shell/public/cpp/lib/shell_connection.cc
|
| +++ /dev/null
|
| @@ -1,95 +0,0 @@
|
| -// 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 "base/bind.h"
|
| -#include "base/logging.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "mojo/public/cpp/bindings/interface_ptr.h"
|
| -#include "mojo/public/cpp/bindings/interface_request.h"
|
| -#include "mojo/shell/public/cpp/capabilities.h"
|
| -#include "mojo/shell/public/cpp/connector.h"
|
| -#include "mojo/shell/public/cpp/lib/connection_impl.h"
|
| -#include "mojo/shell/public/cpp/lib/connector_impl.h"
|
| -#include "mojo/shell/public/cpp/shell_client.h"
|
| -#include "mojo/shell/public/cpp/shell_connection.h"
|
| -
|
| -namespace mojo {
|
| -
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -// ShellConnection, public:
|
| -
|
| -ShellConnection::ShellConnection(mojo::ShellClient* client,
|
| - shell::mojom::ShellClientRequest request)
|
| - : client_(client), binding_(this) {
|
| - shell::mojom::ConnectorPtr connector;
|
| - pending_connector_request_ = GetProxy(&connector);
|
| - connector_.reset(new ConnectorImpl(std::move(connector)));
|
| -
|
| - DCHECK(request.is_pending());
|
| - binding_.Bind(std::move(request));
|
| -}
|
| -
|
| -ShellConnection::~ShellConnection() {}
|
| -
|
| -void ShellConnection::set_initialize_handler(const base::Closure& callback) {
|
| - initialize_handler_ = callback;
|
| -}
|
| -
|
| -void ShellConnection::SetAppTestConnectorForTesting(
|
| - shell::mojom::ConnectorPtr connector) {
|
| - pending_connector_request_ = nullptr;
|
| - connector_.reset(new ConnectorImpl(std::move(connector)));
|
| -}
|
| -
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -// ShellConnection, shell::mojom::ShellClient implementation:
|
| -
|
| -void ShellConnection::Initialize(shell::mojom::IdentityPtr identity,
|
| - uint32_t id,
|
| - const InitializeCallback& callback) {
|
| - if (!initialize_handler_.is_null())
|
| - initialize_handler_.Run();
|
| -
|
| - callback.Run(std::move(pending_connector_request_));
|
| -
|
| - DCHECK(binding_.is_bound());
|
| - binding_.set_connection_error_handler([this] { OnConnectionError(); });
|
| -
|
| - client_->Initialize(connector_.get(), identity.To<Identity>(), id);
|
| -}
|
| -
|
| -void ShellConnection::AcceptConnection(
|
| - shell::mojom::IdentityPtr source,
|
| - uint32_t source_id,
|
| - shell::mojom::InterfaceProviderRequest local_interfaces,
|
| - shell::mojom::InterfaceProviderPtr remote_interfaces,
|
| - shell::mojom::CapabilityRequestPtr allowed_capabilities,
|
| - const String& name) {
|
| - scoped_ptr<Connection> registry(new internal::ConnectionImpl(
|
| - name, source.To<Identity>(), source_id, std::move(remote_interfaces),
|
| - std::move(local_interfaces),
|
| - allowed_capabilities.To<CapabilityRequest>(),
|
| - Connection::State::CONNECTED));
|
| - if (!client_->AcceptConnection(registry.get()))
|
| - return;
|
| -
|
| - // TODO(beng): it appears we never prune this list. We should, when the
|
| - // connection's remote service provider pipe breaks.
|
| - incoming_connections_.push_back(std::move(registry));
|
| -}
|
| -
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -// ShellConnection, private:
|
| -
|
| -void ShellConnection::OnConnectionError() {
|
| - // Note that the ShellClient doesn't technically have to quit now, it may live
|
| - // on to service existing connections. All existing Connectors however are
|
| - // invalid.
|
| - if (client_->ShellConnectionLost() && !connection_lost_closure_.is_null())
|
| - connection_lost_closure_.Run();
|
| - // We don't reset the connector as clients may have taken a raw pointer to it.
|
| - // Connect() will return nullptr if they try to connect to anything.
|
| -}
|
| -
|
| -} // namespace mojo
|
|
|