Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: mojo/public/cpp/application/lib/service_provider_impl.cc

Issue 612243002: Mojo: NULL -> nullptr in mojo/public/cpp outside of bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/public/cpp/application/lib/service_provider_impl.cc
diff --git a/mojo/public/cpp/application/lib/service_provider_impl.cc b/mojo/public/cpp/application/lib/service_provider_impl.cc
index 1edebd25532529411866b2a1537080110c3402ad..08a06484877cfaa93f9e8c9cf91afa6c0ca37222 100644
--- a/mojo/public/cpp/application/lib/service_provider_impl.cc
+++ b/mojo/public/cpp/application/lib/service_provider_impl.cc
@@ -10,7 +10,7 @@
namespace mojo {
-ServiceProviderImpl::ServiceProviderImpl() : remote_(NULL) {
+ServiceProviderImpl::ServiceProviderImpl() : remote_(nullptr) {
}
ServiceProviderImpl::~ServiceProviderImpl() {
@@ -46,7 +46,7 @@ void ServiceProviderImpl::AddServiceConnector(
RemoveServiceConnector(service_connector);
service_connectors_[service_connector->name()] = service_connector;
// TODO(beng): perhaps take app connection thru ctor??
- service_connector->set_application_connection(NULL);
+ service_connector->set_application_connection(nullptr);
}
void ServiceProviderImpl::RemoveServiceConnector(
@@ -62,7 +62,7 @@ void ServiceProviderImpl::RemoveServiceConnector(
void ServiceProviderImpl::ClearRemote() {
if (remote_) {
remote_->Clear();
- remote_ = NULL;
+ remote_ = nullptr;
}
}
« no previous file with comments | « mojo/public/cpp/application/lib/service_connector.cc ('k') | mojo/public/cpp/application/lib/service_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698