OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "content/common/mojo/mojo_shell_connection_impl.h" | 5 #include "content/common/mojo/mojo_shell_connection_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 MojoShellConnectionImpl::~MojoShellConnectionImpl() { | 78 MojoShellConnectionImpl::~MojoShellConnectionImpl() { |
79 STLDeleteElements(&listeners_); | 79 STLDeleteElements(&listeners_); |
80 } | 80 } |
81 | 81 |
82 void MojoShellConnectionImpl::WaitForShell( | 82 void MojoShellConnectionImpl::WaitForShell( |
83 mojo::ScopedMessagePipeHandle handle) { | 83 mojo::ScopedMessagePipeHandle handle) { |
84 mojo::shell::mojom::ShellClientRequest request; | 84 mojo::shell::mojom::ShellClientRequest request; |
85 runner_connection_.reset(mojo::shell::RunnerConnection::ConnectToRunner( | 85 runner_connection_.reset(mojo::shell::RunnerConnection::ConnectToRunner( |
86 &request, std::move(handle), false /* exit_on_error */)); | 86 &request, std::move(handle), false /* exit_on_error */)); |
87 if (!runner_connection_) { | 87 if (!runner_connection_) { |
| 88 DLOG(ERROR) << "Unable to connect to the Mojo shell."; |
88 delete this; | 89 delete this; |
89 lazy_tls_ptr.Pointer()->Set(nullptr); | 90 lazy_tls_ptr.Pointer()->Set(nullptr); |
90 return; | 91 return; |
91 } | 92 } |
92 shell_connection_.reset(new mojo::ShellConnection(this, std::move(request))); | 93 shell_connection_.reset(new mojo::ShellConnection(this, std::move(request))); |
93 shell_connection_->WaitForInitialize(); | 94 shell_connection_->WaitForInitialize(); |
94 } | 95 } |
95 | 96 |
96 void MojoShellConnectionImpl::Initialize(mojo::Connector* connector, | 97 void MojoShellConnectionImpl::Initialize(mojo::Connector* connector, |
97 const std::string& url, | 98 const std::string& url, |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 // static | 137 // static |
137 void MojoShellConnection::Destroy() { | 138 void MojoShellConnection::Destroy() { |
138 // This joins the shell controller thread. | 139 // This joins the shell controller thread. |
139 delete Get(); | 140 delete Get(); |
140 lazy_tls_ptr.Pointer()->Set(nullptr); | 141 lazy_tls_ptr.Pointer()->Set(nullptr); |
141 } | 142 } |
142 | 143 |
143 MojoShellConnection::~MojoShellConnection() {} | 144 MojoShellConnection::~MojoShellConnection() {} |
144 | 145 |
145 } // namespace content | 146 } // namespace content |
OLD | NEW |