| Index: mojo/public/cpp/application/lib/application_impl.cc
|
| diff --git a/mojo/public/cpp/application/lib/application_impl.cc b/mojo/public/cpp/application/lib/application_impl.cc
|
| index 0d173844c20f500a1271b4f61a64bd16a7e6c782..0c86356d4fa77ea051f627e85117c8e4a219aef2 100644
|
| --- a/mojo/public/cpp/application/lib/application_impl.cc
|
| +++ b/mojo/public/cpp/application/lib/application_impl.cc
|
| @@ -27,13 +27,13 @@ class ApplicationImpl::ShellPtrWatcher : public ErrorHandler {
|
|
|
| ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
|
| ScopedMessagePipeHandle shell_handle)
|
| - : initialized_(false), delegate_(delegate), shell_watch_(NULL) {
|
| + : initialized_(false), delegate_(delegate), shell_watch_(nullptr) {
|
| BindShell(shell_handle.Pass());
|
| }
|
|
|
| ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
|
| MojoHandle shell_handle)
|
| - : initialized_(false), delegate_(delegate), shell_watch_(NULL) {
|
| + : initialized_(false), delegate_(delegate), shell_watch_(nullptr) {
|
| BindShell(MakeScopedHandle(MessagePipeHandle(shell_handle)));
|
| }
|
|
|
| @@ -71,7 +71,7 @@ ApplicationConnection* ApplicationImpl::ConnectToApplication(
|
| out_service_provider.Pass());
|
| if (!delegate_->ConfigureOutgoingConnection(registry)) {
|
| delete registry;
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| outgoing_service_registries_.push_back(registry);
|
| return registry;
|
|
|