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/client/plugin/chromoting_instance.h" | 5 #include "remoting/client/plugin/chromoting_instance.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #if defined(OS_NACL) | 10 #if defined(OS_NACL) |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
689 new protocol::NegotiatingClientAuthenticator( | 689 new protocol::NegotiatingClientAuthenticator( |
690 client_pairing_id, client_paired_secret, authentication_tag, | 690 client_pairing_id, client_paired_secret, authentication_tag, |
691 fetch_secret_callback, token_fetcher.Pass(), auth_methods)); | 691 fetch_secret_callback, token_fetcher.Pass(), auth_methods)); |
692 | 692 |
693 scoped_ptr<protocol::CandidateSessionConfig> config = | 693 scoped_ptr<protocol::CandidateSessionConfig> config = |
694 protocol::CandidateSessionConfig::CreateDefault(); | 694 protocol::CandidateSessionConfig::CreateDefault(); |
695 if (std::find(experiments_list.begin(), experiments_list.end(), "vp9") != | 695 if (std::find(experiments_list.begin(), experiments_list.end(), "vp9") != |
696 experiments_list.end()) { | 696 experiments_list.end()) { |
697 config->set_vp9_experiment_enabled(true); | 697 config->set_vp9_experiment_enabled(true); |
698 } | 698 } |
| 699 if (std::find(experiments_list.begin(), experiments_list.end(), "quic") != |
| 700 experiments_list.end()) { |
| 701 config->PreferTransport(protocol::ChannelConfig::TRANSPORT_QUIC_STREAM); |
| 702 } |
699 client_->set_protocol_config(config.Pass()); | 703 client_->set_protocol_config(config.Pass()); |
700 | 704 |
701 // Kick off the connection. | 705 // Kick off the connection. |
702 client_->Start(signal_strategy_.get(), authenticator.Pass(), | 706 client_->Start(signal_strategy_.get(), authenticator.Pass(), |
703 transport_factory.Pass(), host_jid, capabilities); | 707 transport_factory.Pass(), host_jid, capabilities); |
704 | 708 |
705 // Start timer that periodically sends perf stats. | 709 // Start timer that periodically sends perf stats. |
706 plugin_task_runner_->PostDelayedTask( | 710 plugin_task_runner_->PostDelayedTask( |
707 FROM_HERE, base::Bind(&ChromotingInstance::SendPerfStats, | 711 FROM_HERE, base::Bind(&ChromotingInstance::SendPerfStats, |
708 weak_factory_.GetWeakPtr()), | 712 weak_factory_.GetWeakPtr()), |
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1178 | 1182 |
1179 #if !defined(OS_NACL) | 1183 #if !defined(OS_NACL) |
1180 // Log messages are forwarded to the webapp only in PNaCl version of the | 1184 // Log messages are forwarded to the webapp only in PNaCl version of the |
1181 // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl | 1185 // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl |
1182 // version. | 1186 // version. |
1183 ProcessLogToUI(message); | 1187 ProcessLogToUI(message); |
1184 #endif // !defined(OS_NACL) | 1188 #endif // !defined(OS_NACL) |
1185 } | 1189 } |
1186 | 1190 |
1187 } // namespace remoting | 1191 } // namespace remoting |
OLD | NEW |