| 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 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 protocol::NetworkSettings network_settings( | 427 protocol::NetworkSettings network_settings( |
| 428 protocol::NetworkSettings::NAT_TRAVERSAL_FULL); | 428 protocol::NetworkSettings::NAT_TRAVERSAL_FULL); |
| 429 | 429 |
| 430 // Use Chrome's network stack to allocate ports for peer-to-peer channels. | 430 // Use Chrome's network stack to allocate ports for peer-to-peer channels. |
| 431 scoped_ptr<protocol::ChromiumPortAllocator> port_allocator( | 431 scoped_ptr<protocol::ChromiumPortAllocator> port_allocator( |
| 432 protocol::ChromiumPortAllocator::Create(jni_runtime_->url_requester(), | 432 protocol::ChromiumPortAllocator::Create(jni_runtime_->url_requester(), |
| 433 network_settings)); | 433 network_settings)); |
| 434 | 434 |
| 435 scoped_ptr<protocol::TransportFactory> transport_factory( | 435 scoped_ptr<protocol::TransportFactory> transport_factory( |
| 436 new protocol::LibjingleTransportFactory( | 436 new protocol::LibjingleTransportFactory( |
| 437 signaling_.get(), port_allocator.Pass(), network_settings, | 437 signaling_.get(), port_allocator.Pass(), network_settings)); |
| 438 protocol::TransportRole::CLIENT)); | |
| 439 | 438 |
| 440 client_->Start(signaling_.get(), authenticator_.Pass(), | 439 client_->Start(signaling_.get(), authenticator_.Pass(), |
| 441 transport_factory.Pass(), host_jid_, capabilities_); | 440 transport_factory.Pass(), host_jid_, capabilities_); |
| 442 } | 441 } |
| 443 | 442 |
| 444 void ChromotingJniInstance::DisconnectFromHostOnNetworkThread() { | 443 void ChromotingJniInstance::DisconnectFromHostOnNetworkThread() { |
| 445 DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread()); | 444 DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread()); |
| 446 | 445 |
| 447 host_id_.clear(); | 446 host_id_.clear(); |
| 448 | 447 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 stats->round_trip_ms()->Average()); | 530 stats->round_trip_ms()->Average()); |
| 532 | 531 |
| 533 client_status_logger_->LogStatistics(stats); | 532 client_status_logger_->LogStatistics(stats); |
| 534 | 533 |
| 535 jni_runtime_->network_task_runner()->PostDelayedTask( | 534 jni_runtime_->network_task_runner()->PostDelayedTask( |
| 536 FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this), | 535 FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this), |
| 537 base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs)); | 536 base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs)); |
| 538 } | 537 } |
| 539 | 538 |
| 540 } // namespace remoting | 539 } // namespace remoting |
| OLD | NEW |