| Index: services/shell/public/cpp/lib/connection_impl.cc
|
| diff --git a/services/shell/public/cpp/lib/connection_impl.cc b/services/shell/public/cpp/lib/connection_impl.cc
|
| index 9fa299503594032348735f042f8328e2c4bba176..870727c56f9862ef85fa4d22453a2d4299e18e4c 100644
|
| --- a/services/shell/public/cpp/lib/connection_impl.cc
|
| +++ b/services/shell/public/cpp/lib/connection_impl.cc
|
| @@ -20,29 +20,16 @@ namespace internal {
|
| // ConnectionImpl, public:
|
|
|
| ConnectionImpl::ConnectionImpl()
|
| - : allow_all_interfaces_(true),
|
| - weak_factory_(this) {}
|
| + : weak_factory_(this) {}
|
|
|
| -ConnectionImpl::ConnectionImpl(
|
| - const Identity& remote,
|
| - const CapabilityRequest& capability_request,
|
| - State initial_state)
|
| +ConnectionImpl::ConnectionImpl(const Identity& remote, State initial_state)
|
| : remote_(remote),
|
| state_(initial_state),
|
| - capability_request_(capability_request),
|
| - allow_all_interfaces_(capability_request.interfaces.size() == 1 &&
|
| - capability_request.interfaces.count("*") == 1),
|
| weak_factory_(this) {
|
| }
|
|
|
| ConnectionImpl::~ConnectionImpl() {}
|
|
|
| -void ConnectionImpl::SetExposedInterfaces(
|
| - std::unique_ptr<InterfaceRegistry> exposed_interfaces) {
|
| - exposed_interfaces_owner_ = std::move(exposed_interfaces);
|
| - set_exposed_interfaces(exposed_interfaces_owner_.get());
|
| -}
|
| -
|
| void ConnectionImpl::SetRemoteInterfaces(
|
| std::unique_ptr<InterfaceProvider> remote_interfaces) {
|
| remote_interfaces_owner_ = std::move(remote_interfaces);
|
| @@ -57,19 +44,12 @@ shell::mojom::Connector::ConnectCallback ConnectionImpl::GetConnectCallback() {
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // ConnectionImpl, Connection implementation:
|
|
|
| -bool ConnectionImpl::HasCapabilityClass(const std::string& class_name) const {
|
| - return capability_request_.classes.count(class_name) > 0;
|
| -}
|
| -
|
| const Identity& ConnectionImpl::GetRemoteIdentity() const {
|
| return remote_;
|
| }
|
|
|
| void ConnectionImpl::SetConnectionLostClosure(const base::Closure& handler) {
|
| - if (remote_interfaces_)
|
| - remote_interfaces_->SetConnectionLostClosure(handler);
|
| - else
|
| - exposed_interfaces_->SetConnectionLostClosure(handler);
|
| + remote_interfaces_->SetConnectionLostClosure(handler);
|
| }
|
|
|
| shell::mojom::ConnectResult ConnectionImpl::GetResult() const {
|
| @@ -88,15 +68,6 @@ void ConnectionImpl::AddConnectionCompletedClosure(
|
| callback.Run();
|
| }
|
|
|
| -bool ConnectionImpl::AllowsInterface(const std::string& interface_name) const {
|
| - return allow_all_interfaces_ ||
|
| - capability_request_.interfaces.count(interface_name);
|
| -}
|
| -
|
| -InterfaceRegistry* ConnectionImpl::GetInterfaceRegistry() {
|
| - return exposed_interfaces_;
|
| -}
|
| -
|
| InterfaceProvider* ConnectionImpl::GetRemoteInterfaces() {
|
| return remote_interfaces_;
|
| }
|
|
|