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

Side by Side Diff: content/common/mojo/mojo_shell_connection_impl.cc

Issue 1821913002: Revert of Quit the message loop by default in ShellConnectionLost when ApplicationRunner is used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
OLDNEW
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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 uint32_t id) { 119 uint32_t id) {
120 } 120 }
121 121
122 bool MojoShellConnectionImpl::AcceptConnection(mojo::Connection* connection) { 122 bool MojoShellConnectionImpl::AcceptConnection(mojo::Connection* connection) {
123 bool found = false; 123 bool found = false;
124 for (auto listener : listeners_) 124 for (auto listener : listeners_)
125 found |= listener->AcceptConnection(connection); 125 found |= listener->AcceptConnection(connection);
126 return found; 126 return found;
127 } 127 }
128 128
129 void MojoShellConnectionImpl::ShellConnectionLost() {
130 LOG(ERROR) << "Shell connection lost.";
131 }
132
129 mojo::Connector* MojoShellConnectionImpl::GetConnector() { 133 mojo::Connector* MojoShellConnectionImpl::GetConnector() {
130 DCHECK(shell_connection_); 134 DCHECK(shell_connection_);
131 return shell_connection_->connector(); 135 return shell_connection_->connector();
132 } 136 }
133 137
134 bool MojoShellConnectionImpl::UsingExternalShell() const { 138 bool MojoShellConnectionImpl::UsingExternalShell() const {
135 return external_; 139 return external_;
136 } 140 }
137 141
138 void MojoShellConnectionImpl::AddListener(Listener* listener) { 142 void MojoShellConnectionImpl::AddListener(Listener* listener) {
(...skipping 16 matching lines...) Expand all
155 // static 159 // static
156 void MojoShellConnection::Destroy() { 160 void MojoShellConnection::Destroy() {
157 // This joins the shell controller thread. 161 // This joins the shell controller thread.
158 delete Get(); 162 delete Get();
159 lazy_tls_ptr.Pointer()->Set(nullptr); 163 lazy_tls_ptr.Pointer()->Set(nullptr);
160 } 164 }
161 165
162 MojoShellConnection::~MojoShellConnection() {} 166 MojoShellConnection::~MojoShellConnection() {}
163 167
164 } // namespace content 168 } // namespace content
OLDNEW
« no previous file with comments | « content/common/mojo/mojo_shell_connection_impl.h ('k') | mash/browser_driver/browser_driver_application_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698