OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/client/jni/chromoting_jni_instance.h" | 5 #include "remoting/client/jni/chromoting_jni_instance.h" |
6 | 6 |
7 #include <android/log.h> | 7 #include <android/log.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 video_renderer_.get(), | 393 video_renderer_.get(), |
394 audio_player_->GetWeakPtr())); | 394 audio_player_->GetWeakPtr())); |
395 | 395 |
396 signaling_.reset( | 396 signaling_.reset( |
397 new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(), | 397 new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(), |
398 jni_runtime_->url_requester(), xmpp_config_)); | 398 jni_runtime_->url_requester(), xmpp_config_)); |
399 | 399 |
400 scoped_refptr<protocol::TransportContext> transport_context = | 400 scoped_refptr<protocol::TransportContext> transport_context = |
401 new protocol::TransportContext( | 401 new protocol::TransportContext( |
402 signaling_.get(), | 402 signaling_.get(), |
403 base::WrapUnique(new protocol::ChromiumPortAllocatorFactory()), | 403 base::MakeUnique<protocol::ChromiumPortAllocatorFactory>(), |
404 base::WrapUnique( | 404 base::MakeUnique<ChromiumUrlRequestFactory>( |
405 new ChromiumUrlRequestFactory(jni_runtime_->url_requester())), | 405 jni_runtime_->url_requester()), |
406 protocol::NetworkSettings( | 406 protocol::NetworkSettings( |
407 protocol::NetworkSettings::NAT_TRAVERSAL_FULL), | 407 protocol::NetworkSettings::NAT_TRAVERSAL_FULL), |
408 protocol::TransportRole::CLIENT); | 408 protocol::TransportRole::CLIENT); |
409 | 409 |
410 #if defined(ENABLE_WEBRTC_REMOTING_CLIENT) | 410 #if defined(ENABLE_WEBRTC_REMOTING_CLIENT) |
411 if (flags_.find("useWebrtc") != std::string::npos) { | 411 if (flags_.find("useWebrtc") != std::string::npos) { |
412 VLOG(0) << "Attempting to connect using WebRTC."; | 412 VLOG(0) << "Attempting to connect using WebRTC."; |
413 std::unique_ptr<protocol::CandidateSessionConfig> protocol_config = | 413 std::unique_ptr<protocol::CandidateSessionConfig> protocol_config = |
414 protocol::CandidateSessionConfig::CreateEmpty(); | 414 protocol::CandidateSessionConfig::CreateEmpty(); |
415 protocol_config->set_webrtc_supported(true); | 415 protocol_config->set_webrtc_supported(true); |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 video_renderer_.reset(); | 496 video_renderer_.reset(); |
497 signaling_.reset(); | 497 signaling_.reset(); |
498 perf_tracker_.reset(); | 498 perf_tracker_.reset(); |
499 client_context_.reset(); | 499 client_context_.reset(); |
500 cursor_shape_stub_.reset(); | 500 cursor_shape_stub_.reset(); |
501 | 501 |
502 weak_factory_.InvalidateWeakPtrs(); | 502 weak_factory_.InvalidateWeakPtrs(); |
503 } | 503 } |
504 | 504 |
505 } // namespace remoting | 505 } // namespace remoting |
OLD | NEW |