Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "remoting/host/chromoting_host.h" | 5 #include "remoting/host/chromoting_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 134 void ChromotingHost::AddStatusObserver(HostStatusObserver* observer) { | 134 void ChromotingHost::AddStatusObserver(HostStatusObserver* observer) { |
| 135 DCHECK(CalledOnValidThread()); | 135 DCHECK(CalledOnValidThread()); |
| 136 status_observers_.AddObserver(observer); | 136 status_observers_.AddObserver(observer); |
| 137 } | 137 } |
| 138 | 138 |
| 139 void ChromotingHost::RemoveStatusObserver(HostStatusObserver* observer) { | 139 void ChromotingHost::RemoveStatusObserver(HostStatusObserver* observer) { |
| 140 DCHECK(CalledOnValidThread()); | 140 DCHECK(CalledOnValidThread()); |
| 141 status_observers_.RemoveObserver(observer); | 141 status_observers_.RemoveObserver(observer); |
| 142 } | 142 } |
| 143 | 143 |
| 144 void ChromotingHost::AddExtension(scoped_ptr<Extension> extension) { | |
| 145 extensions_.push_back(extension.release()); | |
| 146 } | |
| 147 | |
| 144 void ChromotingHost::RejectAuthenticatingClient() { | 148 void ChromotingHost::RejectAuthenticatingClient() { |
| 145 DCHECK(authenticating_client_); | 149 DCHECK(authenticating_client_); |
| 146 reject_authenticating_client_ = true; | 150 reject_authenticating_client_ = true; |
| 147 } | 151 } |
| 148 | 152 |
| 149 void ChromotingHost::SetAuthenticatorFactory( | 153 void ChromotingHost::SetAuthenticatorFactory( |
| 150 scoped_ptr<protocol::AuthenticatorFactory> authenticator_factory) { | 154 scoped_ptr<protocol::AuthenticatorFactory> authenticator_factory) { |
| 151 DCHECK(CalledOnValidThread()); | 155 DCHECK(CalledOnValidThread()); |
| 152 session_manager_->set_authenticator_factory(authenticator_factory.Pass()); | 156 session_manager_->set_authenticator_factory(authenticator_factory.Pass()); |
| 153 } | 157 } |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 312 this, | 316 this, |
| 313 audio_task_runner_, | 317 audio_task_runner_, |
| 314 input_task_runner_, | 318 input_task_runner_, |
| 315 video_capture_task_runner_, | 319 video_capture_task_runner_, |
| 316 video_encode_task_runner_, | 320 video_encode_task_runner_, |
| 317 network_task_runner_, | 321 network_task_runner_, |
| 318 ui_task_runner_, | 322 ui_task_runner_, |
| 319 connection.Pass(), | 323 connection.Pass(), |
| 320 desktop_environment_factory_, | 324 desktop_environment_factory_, |
| 321 max_session_duration_, | 325 max_session_duration_, |
| 322 pairing_registry_); | 326 pairing_registry_, |
| 327 &extensions_.get()); | |
|
Wez
2014/05/28 01:05:59
This looks weird; does ScopedVector.get() return t
dcaiafa
2014/05/28 22:44:58
Removed.
| |
| 323 clients_.push_back(client); | 328 clients_.push_back(client); |
| 324 } | 329 } |
| 325 | 330 |
| 326 void ChromotingHost::set_protocol_config( | 331 void ChromotingHost::set_protocol_config( |
| 327 scoped_ptr<protocol::CandidateSessionConfig> config) { | 332 scoped_ptr<protocol::CandidateSessionConfig> config) { |
| 328 DCHECK(CalledOnValidThread()); | 333 DCHECK(CalledOnValidThread()); |
| 329 DCHECK(config.get()); | 334 DCHECK(config.get()); |
| 330 DCHECK(!started_); | 335 DCHECK(!started_); |
| 331 protocol_config_ = config.Pass(); | 336 protocol_config_ = config.Pass(); |
| 332 } | 337 } |
| 333 | 338 |
| 334 void ChromotingHost::DisconnectAllClients() { | 339 void ChromotingHost::DisconnectAllClients() { |
| 335 DCHECK(CalledOnValidThread()); | 340 DCHECK(CalledOnValidThread()); |
| 336 | 341 |
| 337 while (!clients_.empty()) { | 342 while (!clients_.empty()) { |
| 338 size_t size = clients_.size(); | 343 size_t size = clients_.size(); |
| 339 clients_.front()->DisconnectSession(); | 344 clients_.front()->DisconnectSession(); |
| 340 CHECK_EQ(clients_.size(), size - 1); | 345 CHECK_EQ(clients_.size(), size - 1); |
| 341 } | 346 } |
| 342 } | 347 } |
| 343 | 348 |
| 344 } // namespace remoting | 349 } // namespace remoting |
| OLD | NEW |