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

Side by Side Diff: mojo/shell/public/cpp/lib/application_runner.cc

Issue 1755423002: Add a test for application lifecycle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@27amtest
Patch Set: . Created 4 years, 9 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
« no previous file with comments | « mojo/shell/public/cpp/application_runner.h ('k') | mojo/shell/tests/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/shell/public/cpp/application_runner.h" 5 #include "mojo/shell/public/cpp/application_runner.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 at_exit.reset(new base::AtExitManager); 47 at_exit.reset(new base::AtExitManager);
48 } 48 }
49 49
50 { 50 {
51 scoped_ptr<base::MessageLoop> loop; 51 scoped_ptr<base::MessageLoop> loop;
52 if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM) 52 if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM)
53 loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create())); 53 loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create()));
54 else 54 else
55 loop.reset(new base::MessageLoop(message_loop_type_)); 55 loop.reset(new base::MessageLoop(message_loop_type_));
56 56
57 ShellConnection impl(client_.get(), 57 connection_.reset(new ShellConnection(
58 MakeRequest<shell::mojom::ShellClient>( 58 client_.get(),
59 MakeScopedHandle(MessagePipeHandle( 59 MakeRequest<shell::mojom::ShellClient>(MakeScopedHandle(
60 shell_client_request_handle)))); 60 MessagePipeHandle(shell_client_request_handle)))));
61 loop->Run(); 61 loop->Run();
62 // It's very common for the client to cache the app and terminate on errors. 62 // It's very common for the client to cache the app and terminate on errors.
63 // If we don't delete the client before the app we run the risk of the 63 // If we don't delete the client before the app we run the risk of the
64 // client having a stale reference to the app and trying to use it. 64 // client having a stale reference to the app and trying to use it.
65 // Note that we destruct the message loop first because that might trigger 65 // Note that we destruct the message loop first because that might trigger
66 // connection error handlers and they might access objects created by the 66 // connection error handlers and they might access objects created by the
67 // client. 67 // client.
68 loop.reset(); 68 loop.reset();
69 client_.reset(); 69 client_.reset();
70 connection_.reset();
70 } 71 }
71 return MOJO_RESULT_OK; 72 return MOJO_RESULT_OK;
72 } 73 }
73 74
74 MojoResult ApplicationRunner::Run(MojoHandle shell_client_request_handle) { 75 MojoResult ApplicationRunner::Run(MojoHandle shell_client_request_handle) {
75 bool init_base = true; 76 bool init_base = true;
76 if (base::CommandLine::InitializedForCurrentProcess()) { 77 if (base::CommandLine::InitializedForCurrentProcess()) {
77 init_base = 78 init_base =
78 !base::CommandLine::ForCurrentProcess()->HasSwitch("single-process"); 79 !base::CommandLine::ForCurrentProcess()->HasSwitch("single-process");
79 } 80 }
80 return Run(shell_client_request_handle, init_base); 81 return Run(shell_client_request_handle, init_base);
81 } 82 }
82 83
84 void ApplicationRunner::DestroyShellConnection() {
85 connection_.reset();
86 }
87
83 } // namespace mojo 88 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/public/cpp/application_runner.h ('k') | mojo/shell/tests/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698