OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "mojo/public/cpp/application/service_provider_impl.h" | 5 #include "mojo/public/cpp/application/service_provider_impl.h" |
6 | 6 |
7 #include "mojo/public/cpp/application/lib/service_connector.h" | 7 #include "mojo/public/cpp/application/lib/service_connector.h" |
8 #include "mojo/public/cpp/application/lib/weak_service_provider.h" | 8 #include "mojo/public/cpp/application/lib/weak_service_provider.h" |
9 #include "mojo/public/cpp/environment/logging.h" | 9 #include "mojo/public/cpp/environment/logging.h" |
10 | 10 |
11 namespace mojo { | 11 namespace mojo { |
12 | 12 |
13 ServiceProviderImpl::ServiceProviderImpl() : remote_(NULL) { | 13 ServiceProviderImpl::ServiceProviderImpl() : remote_(nullptr) { |
14 } | 14 } |
15 | 15 |
16 ServiceProviderImpl::~ServiceProviderImpl() { | 16 ServiceProviderImpl::~ServiceProviderImpl() { |
17 } | 17 } |
18 | 18 |
19 ServiceProvider* ServiceProviderImpl::CreateRemoteServiceProvider() { | 19 ServiceProvider* ServiceProviderImpl::CreateRemoteServiceProvider() { |
20 // TODO(beng): it sure would be nice if this method could return a scoped_ptr. | 20 // TODO(beng): it sure would be nice if this method could return a scoped_ptr. |
21 MOJO_DCHECK(!remote_); | 21 MOJO_DCHECK(!remote_); |
22 remote_ = new internal::WeakServiceProvider(this, client()); | 22 remote_ = new internal::WeakServiceProvider(this, client()); |
23 return remote_; | 23 return remote_; |
(...skipping 15 matching lines...) Expand all Loading... |
39 | 39 |
40 void ServiceProviderImpl::OnConnectionError() { | 40 void ServiceProviderImpl::OnConnectionError() { |
41 ClearRemote(); | 41 ClearRemote(); |
42 } | 42 } |
43 | 43 |
44 void ServiceProviderImpl::AddServiceConnector( | 44 void ServiceProviderImpl::AddServiceConnector( |
45 internal::ServiceConnectorBase* service_connector) { | 45 internal::ServiceConnectorBase* service_connector) { |
46 RemoveServiceConnector(service_connector); | 46 RemoveServiceConnector(service_connector); |
47 service_connectors_[service_connector->name()] = service_connector; | 47 service_connectors_[service_connector->name()] = service_connector; |
48 // TODO(beng): perhaps take app connection thru ctor?? | 48 // TODO(beng): perhaps take app connection thru ctor?? |
49 service_connector->set_application_connection(NULL); | 49 service_connector->set_application_connection(nullptr); |
50 } | 50 } |
51 | 51 |
52 void ServiceProviderImpl::RemoveServiceConnector( | 52 void ServiceProviderImpl::RemoveServiceConnector( |
53 internal::ServiceConnectorBase* service_connector) { | 53 internal::ServiceConnectorBase* service_connector) { |
54 NameToServiceConnectorMap::iterator it = | 54 NameToServiceConnectorMap::iterator it = |
55 service_connectors_.find(service_connector->name()); | 55 service_connectors_.find(service_connector->name()); |
56 if (it == service_connectors_.end()) | 56 if (it == service_connectors_.end()) |
57 return; | 57 return; |
58 delete it->second; | 58 delete it->second; |
59 service_connectors_.erase(it); | 59 service_connectors_.erase(it); |
60 } | 60 } |
61 | 61 |
62 void ServiceProviderImpl::ClearRemote() { | 62 void ServiceProviderImpl::ClearRemote() { |
63 if (remote_) { | 63 if (remote_) { |
64 remote_->Clear(); | 64 remote_->Clear(); |
65 remote_ = NULL; | 65 remote_ = nullptr; |
66 } | 66 } |
67 } | 67 } |
68 | 68 |
69 } // namespace mojo | 69 } // namespace mojo |
OLD | NEW |