| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 WaitForShell(std::move(handle)); | 57 WaitForShell(std::move(handle)); |
| 58 } | 58 } |
| 59 | 59 |
| 60 MojoShellConnectionImpl::MojoShellConnectionImpl() : initialized_(false) {} | 60 MojoShellConnectionImpl::MojoShellConnectionImpl() : initialized_(false) {} |
| 61 MojoShellConnectionImpl::~MojoShellConnectionImpl() { | 61 MojoShellConnectionImpl::~MojoShellConnectionImpl() { |
| 62 STLDeleteElements(&listeners_); | 62 STLDeleteElements(&listeners_); |
| 63 } | 63 } |
| 64 | 64 |
| 65 void MojoShellConnectionImpl::WaitForShell( | 65 void MojoShellConnectionImpl::WaitForShell( |
| 66 mojo::ScopedMessagePipeHandle handle) { | 66 mojo::ScopedMessagePipeHandle handle) { |
| 67 mojo::ShellClientRequest request; | 67 mojo::shell::mojom::ShellClientRequest request; |
| 68 runner_connection_.reset(mojo::shell::RunnerConnection::ConnectToRunner( | 68 runner_connection_.reset(mojo::shell::RunnerConnection::ConnectToRunner( |
| 69 &request, std::move(handle))); | 69 &request, std::move(handle))); |
| 70 shell_connection_.reset(new mojo::ShellConnection(this, std::move(request))); | 70 shell_connection_.reset(new mojo::ShellConnection(this, std::move(request))); |
| 71 shell_connection_->WaitForInitialize(); | 71 shell_connection_->WaitForInitialize(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void MojoShellConnectionImpl::Initialize(mojo::Shell* shell, | 74 void MojoShellConnectionImpl::Initialize(mojo::Shell* shell, |
| 75 const std::string& url, | 75 const std::string& url, |
| 76 uint32_t id, | 76 uint32_t id, |
| 77 uint32_t user_id) { | 77 uint32_t user_id) { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 // static | 114 // static |
| 115 void MojoShellConnection::Destroy() { | 115 void MojoShellConnection::Destroy() { |
| 116 // This joins the shell controller thread. | 116 // This joins the shell controller thread. |
| 117 delete Get(); | 117 delete Get(); |
| 118 lazy_tls_ptr.Pointer()->Set(nullptr); | 118 lazy_tls_ptr.Pointer()->Set(nullptr); |
| 119 } | 119 } |
| 120 | 120 |
| 121 MojoShellConnection::~MojoShellConnection() {} | 121 MojoShellConnection::~MojoShellConnection() {} |
| 122 | 122 |
| 123 } // namespace content | 123 } // namespace content |
| OLD | NEW |