| OLD | NEW |
| 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/bind.h" |
| 8 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 11 #include "base/process/launch.h" | 12 #include "base/process/launch.h" |
| 13 #include "base/run_loop.h" |
| 12 #include "mojo/shell/public/cpp/shell_client.h" | 14 #include "mojo/shell/public/cpp/shell_client.h" |
| 13 #include "mojo/shell/public/cpp/shell_connection.h" | 15 #include "mojo/shell/public/cpp/shell_connection.h" |
| 14 | 16 |
| 15 namespace mojo { | 17 namespace mojo { |
| 16 | 18 |
| 17 int g_application_runner_argc; | 19 int g_application_runner_argc; |
| 18 const char* const* g_application_runner_argv; | 20 const char* const* g_application_runner_argv; |
| 19 | 21 |
| 20 ApplicationRunner::ApplicationRunner(ShellClient* client) | 22 ApplicationRunner::ApplicationRunner(ShellClient* client) |
| 21 : client_(scoped_ptr<ShellClient>(client)), | 23 : client_(scoped_ptr<ShellClient>(client)), |
| (...skipping 25 matching lines...) Expand all Loading... |
| 47 } | 49 } |
| 48 | 50 |
| 49 { | 51 { |
| 50 scoped_ptr<base::MessageLoop> loop; | 52 scoped_ptr<base::MessageLoop> loop; |
| 51 loop.reset(new base::MessageLoop(message_loop_type_)); | 53 loop.reset(new base::MessageLoop(message_loop_type_)); |
| 52 | 54 |
| 53 connection_.reset(new ShellConnection( | 55 connection_.reset(new ShellConnection( |
| 54 client_.get(), | 56 client_.get(), |
| 55 MakeRequest<shell::mojom::ShellClient>(MakeScopedHandle( | 57 MakeRequest<shell::mojom::ShellClient>(MakeScopedHandle( |
| 56 MessagePipeHandle(shell_client_request_handle))))); | 58 MessagePipeHandle(shell_client_request_handle))))); |
| 57 loop->Run(); | 59 base::RunLoop run_loop; |
| 60 connection_->set_connection_lost_closure(run_loop.QuitClosure()); |
| 61 run_loop.Run(); |
| 58 // 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. |
| 59 // 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 |
| 60 // 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. |
| 61 // 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 |
| 62 // connection error handlers and they might access objects created by the | 66 // connection error handlers and they might access objects created by the |
| 63 // client. | 67 // client. |
| 64 loop.reset(); | 68 loop.reset(); |
| 65 client_.reset(); | 69 client_.reset(); |
| 66 connection_.reset(); | 70 connection_.reset(); |
| 67 } | 71 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 79 | 83 |
| 80 void ApplicationRunner::DestroyShellConnection() { | 84 void ApplicationRunner::DestroyShellConnection() { |
| 81 connection_.reset(); | 85 connection_.reset(); |
| 82 } | 86 } |
| 83 | 87 |
| 84 void ApplicationRunner::Quit() { | 88 void ApplicationRunner::Quit() { |
| 85 base::MessageLoop::current()->QuitWhenIdle(); | 89 base::MessageLoop::current()->QuitWhenIdle(); |
| 86 } | 90 } |
| 87 | 91 |
| 88 } // namespace mojo | 92 } // namespace mojo |
| OLD | NEW |