| 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 #include <nacl_io/nacl_io.h> | 10 #include <nacl_io/nacl_io.h> |
| (...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 new protocol::NegotiatingClientAuthenticator( | 720 new protocol::NegotiatingClientAuthenticator( |
| 721 client_pairing_id, client_paired_secret, authentication_tag, | 721 client_pairing_id, client_paired_secret, authentication_tag, |
| 722 fetch_secret_callback, token_fetcher.Pass(), auth_methods)); | 722 fetch_secret_callback, token_fetcher.Pass(), auth_methods)); |
| 723 | 723 |
| 724 scoped_ptr<protocol::CandidateSessionConfig> config = | 724 scoped_ptr<protocol::CandidateSessionConfig> config = |
| 725 protocol::CandidateSessionConfig::CreateDefault(); | 725 protocol::CandidateSessionConfig::CreateDefault(); |
| 726 if (std::find(experiments_list.begin(), experiments_list.end(), "vp9") != | 726 if (std::find(experiments_list.begin(), experiments_list.end(), "vp9") != |
| 727 experiments_list.end()) { | 727 experiments_list.end()) { |
| 728 config->set_vp9_experiment_enabled(true); | 728 config->set_vp9_experiment_enabled(true); |
| 729 } | 729 } |
| 730 if (std::find(experiments_list.begin(), experiments_list.end(), "quic") != | |
| 731 experiments_list.end()) { | |
| 732 config->PreferTransport(protocol::ChannelConfig::TRANSPORT_QUIC_STREAM); | |
| 733 } | |
| 734 client_->set_protocol_config(config.Pass()); | 730 client_->set_protocol_config(config.Pass()); |
| 735 | 731 |
| 736 // Kick off the connection. | 732 // Kick off the connection. |
| 737 client_->Start(signal_strategy_.get(), authenticator.Pass(), | 733 client_->Start(signal_strategy_.get(), authenticator.Pass(), |
| 738 transport_factory.Pass(), host_jid, capabilities); | 734 transport_factory.Pass(), host_jid, capabilities); |
| 739 | 735 |
| 740 // Start timer that periodically sends perf stats. | 736 // Start timer that periodically sends perf stats. |
| 741 stats_update_timer_.Start( | 737 stats_update_timer_.Start( |
| 742 FROM_HERE, base::TimeDelta::FromSeconds(kUIStatsUpdatePeriodSeconds), | 738 FROM_HERE, base::TimeDelta::FromSeconds(kUIStatsUpdatePeriodSeconds), |
| 743 base::Bind(&ChromotingInstance::UpdatePerfStatsInUI, | 739 base::Bind(&ChromotingInstance::UpdatePerfStatsInUI, |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1151 if (is_custom_counts_histogram) { | 1147 if (is_custom_counts_histogram) { |
| 1152 uma.HistogramCustomCounts(histogram_name, value, histogram_min, | 1148 uma.HistogramCustomCounts(histogram_name, value, histogram_min, |
| 1153 histogram_max, histogram_buckets); | 1149 histogram_max, histogram_buckets); |
| 1154 } else { | 1150 } else { |
| 1155 uma.HistogramCustomTimes(histogram_name, value, histogram_min, | 1151 uma.HistogramCustomTimes(histogram_name, value, histogram_min, |
| 1156 histogram_max, histogram_buckets); | 1152 histogram_max, histogram_buckets); |
| 1157 } | 1153 } |
| 1158 } | 1154 } |
| 1159 | 1155 |
| 1160 } // namespace remoting | 1156 } // namespace remoting |
| OLD | NEW |