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

Unified Diff: mojo/public/cpp/application/lib/application_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/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;
« no previous file with comments | « mojo/public/cpp/application/lazy_interface_ptr.h ('k') | mojo/public/cpp/application/lib/application_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698