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

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

Issue 1517743003: Make ApplicationRunner's ctor's ApplicationDelegate* argument an std::unique_ptr instead. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years 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_runner.cc
diff --git a/mojo/public/cpp/application/lib/application_runner.cc b/mojo/public/cpp/application/lib/application_runner.cc
index 214d09f64564b3d362f8587a82840fedc338705b..3654715f92385c3884b7cc8fb7dedbe8ed066a7d 100644
--- a/mojo/public/cpp/application/lib/application_runner.cc
+++ b/mojo/public/cpp/application/lib/application_runner.cc
@@ -20,8 +20,9 @@ void ApplicationImpl::Terminate() {
RunLoop::current()->Quit();
}
-ApplicationRunner::ApplicationRunner(ApplicationDelegate* delegate)
- : delegate_(delegate) {}
+ApplicationRunner::ApplicationRunner(
+ std::unique_ptr<ApplicationDelegate> delegate)
+ : delegate_(std::move(delegate)) {}
ApplicationRunner::~ApplicationRunner() {
assert(!delegate_);
@@ -47,13 +48,13 @@ MojoResult ApplicationRunner::Run(MojoHandle app_request_handle) {
Environment env;
{
RunLoop loop;
- ApplicationImpl app(delegate_, MakeRequest<Application>(MakeScopedHandle(
- MessagePipeHandle(app_request_handle))));
+ ApplicationImpl app(delegate_.get(),
+ MakeRequest<Application>(MakeScopedHandle(
+ MessagePipeHandle(app_request_handle))));
loop.Run();
}
- delete delegate_;
- delegate_ = nullptr;
+ delegate_.reset();
g_running = false;
« no previous file with comments | « mojo/public/cpp/application/application_runner.h ('k') | mojo/public/cpp/bindings/tests/versioning_test_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698