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

Side by Side Diff: mojo/public/cpp/application/lib/application_runner.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, 2 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 unified diff | Download patch
OLDNEW
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/application_runner.h" 5 #include "mojo/public/cpp/application/application_runner.h"
6 6
7 #include "mojo/public/cpp/application/application_delegate.h" 7 #include "mojo/public/cpp/application/application_delegate.h"
8 #include "mojo/public/cpp/application/application_impl.h" 8 #include "mojo/public/cpp/application/application_impl.h"
9 #include "mojo/public/cpp/environment/environment.h" 9 #include "mojo/public/cpp/environment/environment.h"
10 #include "mojo/public/cpp/utility/run_loop.h" 10 #include "mojo/public/cpp/utility/run_loop.h"
(...skipping 12 matching lines...) Expand all
23 MojoResult ApplicationRunner::Run(MojoHandle shell_handle) { 23 MojoResult ApplicationRunner::Run(MojoHandle shell_handle) {
24 Environment env; 24 Environment env;
25 { 25 {
26 RunLoop loop; 26 RunLoop loop;
27 ApplicationImpl app(delegate_, 27 ApplicationImpl app(delegate_,
28 MakeScopedHandle(MessagePipeHandle(shell_handle))); 28 MakeScopedHandle(MessagePipeHandle(shell_handle)));
29 loop.Run(); 29 loop.Run();
30 } 30 }
31 31
32 delete delegate_; 32 delete delegate_;
33 delegate_ = NULL; 33 delegate_ = nullptr;
34 return MOJO_RESULT_OK; 34 return MOJO_RESULT_OK;
35 } 35 }
36 36
37 } // namespace mojo 37 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/application/lib/application_impl.cc ('k') | mojo/public/cpp/application/lib/service_connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698