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/client_session.h" | 5 #include "remoting/host/client_session.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/message_loop/message_loop_proxy.h" |
| 10 #include "remoting/base/capabilities.h" | 10 #include "remoting/base/capabilities.h" |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 203 } else { | 203 } else { |
| 204 HOST_LOG << "gnubby auth is not enabled"; | 204 HOST_LOG << "gnubby auth is not enabled"; |
| 205 } | 205 } |
| 206 return; | 206 return; |
| 207 } | 207 } |
| 208 } | 208 } |
| 209 HOST_LOG << "Unexpected message received: " | 209 HOST_LOG << "Unexpected message received: " |
| 210 << message.type() << ": " << message.data(); | 210 << message.type() << ": " << message.data(); |
| 211 } | 211 } |
| 212 | 212 |
| 213 void ClientSession::OnConnectionAuthenticating( | |
| 214 protocol::ConnectionToClient* connection) { | |
| 215 DCHECK(event_handler_); | |
|
Sergey Ulanov
2014/03/26 01:49:16
nit: don't need this DCHECK.
kelvinp
2014/03/27 03:23:21
Done.
| |
| 216 event_handler_->OnSessionAuthenticating(this); | |
| 217 } | |
| 218 | |
| 213 void ClientSession::OnConnectionAuthenticated( | 219 void ClientSession::OnConnectionAuthenticated( |
| 214 protocol::ConnectionToClient* connection) { | 220 protocol::ConnectionToClient* connection) { |
| 215 DCHECK(CalledOnValidThread()); | 221 DCHECK(CalledOnValidThread()); |
| 216 DCHECK_EQ(connection_.get(), connection); | 222 DCHECK_EQ(connection_.get(), connection); |
| 217 DCHECK(!audio_scheduler_.get()); | 223 DCHECK(!audio_scheduler_.get()); |
| 218 DCHECK(!desktop_environment_); | 224 DCHECK(!desktop_environment_); |
| 219 DCHECK(!input_injector_); | 225 DCHECK(!input_injector_); |
| 220 DCHECK(!screen_controls_); | 226 DCHECK(!screen_controls_); |
| 221 DCHECK(!video_scheduler_.get()); | 227 DCHECK(!video_scheduler_.get()); |
| 222 | 228 |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 459 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); | 465 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); |
| 460 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { | 466 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { |
| 461 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); | 467 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); |
| 462 } | 468 } |
| 463 | 469 |
| 464 NOTREACHED(); | 470 NOTREACHED(); |
| 465 return scoped_ptr<AudioEncoder>(); | 471 return scoped_ptr<AudioEncoder>(); |
| 466 } | 472 } |
| 467 | 473 |
| 468 } // namespace remoting | 474 } // namespace remoting |
| OLD | NEW |