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/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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 } | 70 } |
71 return MOJO_RESULT_OK; | 71 return MOJO_RESULT_OK; |
72 } | 72 } |
73 | 73 |
74 MojoResult ApplicationRunner::Run(MojoHandle shell_client_request_handle) { | 74 MojoResult ApplicationRunner::Run(MojoHandle shell_client_request_handle) { |
75 return Run(shell_client_request_handle, true); | 75 bool init_base = true; |
| 76 if (base::CommandLine::InitializedForCurrentProcess()) { |
| 77 init_base = |
| 78 !base::CommandLine::ForCurrentProcess()->HasSwitch("single-process"); |
| 79 } |
| 80 return Run(shell_client_request_handle, init_base); |
76 } | 81 } |
77 | 82 |
78 } // namespace mojo | 83 } // namespace mojo |
OLD | NEW |