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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 connection_->client_stub()->DeliverHostMessage(reply); | 228 connection_->client_stub()->DeliverHostMessage(reply); |
229 return; | 229 return; |
230 } else if (message.type() == "gnubby-auth") { | 230 } else if (message.type() == "gnubby-auth") { |
231 if (gnubby_auth_handler_) { | 231 if (gnubby_auth_handler_) { |
232 gnubby_auth_handler_->DeliverClientMessage(message.data()); | 232 gnubby_auth_handler_->DeliverClientMessage(message.data()); |
233 } else { | 233 } else { |
234 HOST_LOG << "gnubby auth is not enabled"; | 234 HOST_LOG << "gnubby auth is not enabled"; |
235 } | 235 } |
236 return; | 236 return; |
237 } else { | 237 } else { |
238 extension_manager_->OnExtensionMessage(message); | 238 if (!extension_manager_->OnExtensionMessage(message)) |
239 return; | 239 return; |
| 240 |
| 241 DLOG(INFO) << "Unexpected message received: " |
| 242 << message.type() << ": " << message.data(); |
240 } | 243 } |
241 } | 244 } |
242 HOST_LOG << "Unexpected message received: " | |
243 << message.type() << ": " << message.data(); | |
244 } | 245 } |
245 | 246 |
246 void ClientSession::OnConnectionAuthenticating( | 247 void ClientSession::OnConnectionAuthenticating( |
247 protocol::ConnectionToClient* connection) { | 248 protocol::ConnectionToClient* connection) { |
248 event_handler_->OnSessionAuthenticating(this); | 249 event_handler_->OnSessionAuthenticating(this); |
249 } | 250 } |
250 | 251 |
251 void ClientSession::OnConnectionAuthenticated( | 252 void ClientSession::OnConnectionAuthenticated( |
252 protocol::ConnectionToClient* connection) { | 253 protocol::ConnectionToClient* connection) { |
253 DCHECK(CalledOnValidThread()); | 254 DCHECK(CalledOnValidThread()); |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
528 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); | 529 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); |
529 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { | 530 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { |
530 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); | 531 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); |
531 } | 532 } |
532 | 533 |
533 NOTREACHED(); | 534 NOTREACHED(); |
534 return scoped_ptr<AudioEncoder>(); | 535 return scoped_ptr<AudioEncoder>(); |
535 } | 536 } |
536 | 537 |
537 } // namespace remoting | 538 } // namespace remoting |
OLD | NEW |