| 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 <nacl_io/nacl_io.h> | 7 #include <nacl_io/nacl_io.h> | 
| 8 #include <sys/mount.h> | 8 #include <sys/mount.h> | 
| 9 | 9 | 
| 10 #include <string> | 10 #include <string> | 
| (...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 696               protocol::NetworkSettings::NAT_TRAVERSAL_FULL), | 696               protocol::NetworkSettings::NAT_TRAVERSAL_FULL), | 
| 697           protocol::TransportRole::CLIENT)); | 697           protocol::TransportRole::CLIENT)); | 
| 698 | 698 | 
| 699   // Create Authenticator. | 699   // Create Authenticator. | 
| 700   scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher> | 700   scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher> | 
| 701       token_fetcher(new TokenFetcherProxy( | 701       token_fetcher(new TokenFetcherProxy( | 
| 702           base::Bind(&ChromotingInstance::FetchThirdPartyToken, | 702           base::Bind(&ChromotingInstance::FetchThirdPartyToken, | 
| 703                      weak_factory_.GetWeakPtr()), | 703                      weak_factory_.GetWeakPtr()), | 
| 704           host_public_key)); | 704           host_public_key)); | 
| 705 | 705 | 
| 706   std::vector<protocol::AuthenticationMethod> auth_methods; |  | 
| 707   auth_methods.push_back(protocol::AuthenticationMethod::THIRD_PARTY); |  | 
| 708   auth_methods.push_back(protocol::AuthenticationMethod::SPAKE2_PAIR); |  | 
| 709   auth_methods.push_back( |  | 
| 710       protocol::AuthenticationMethod::SPAKE2_SHARED_SECRET_HMAC); |  | 
| 711   auth_methods.push_back( |  | 
| 712       protocol::AuthenticationMethod::SPAKE2_SHARED_SECRET_PLAIN); |  | 
| 713 |  | 
| 714   scoped_ptr<protocol::Authenticator> authenticator( | 706   scoped_ptr<protocol::Authenticator> authenticator( | 
| 715       new protocol::NegotiatingClientAuthenticator( | 707       new protocol::NegotiatingClientAuthenticator( | 
| 716           client_pairing_id, client_paired_secret, authentication_tag, | 708           client_pairing_id, client_paired_secret, authentication_tag, | 
| 717           fetch_secret_callback, std::move(token_fetcher), auth_methods)); | 709           fetch_secret_callback, std::move(token_fetcher))); | 
| 718 | 710 | 
| 719   scoped_ptr<protocol::CandidateSessionConfig> config = | 711   scoped_ptr<protocol::CandidateSessionConfig> config = | 
| 720       protocol::CandidateSessionConfig::CreateDefault(); | 712       protocol::CandidateSessionConfig::CreateDefault(); | 
| 721   if (std::find(experiments_list.begin(), experiments_list.end(), "vp9") != | 713   if (std::find(experiments_list.begin(), experiments_list.end(), "vp9") != | 
| 722       experiments_list.end()) { | 714       experiments_list.end()) { | 
| 723     config->set_vp9_experiment_enabled(true); | 715     config->set_vp9_experiment_enabled(true); | 
| 724   } | 716   } | 
| 725   client_->set_protocol_config(std::move(config)); | 717   client_->set_protocol_config(std::move(config)); | 
| 726 | 718 | 
| 727   // Kick off the connection. | 719   // Kick off the connection. | 
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1151   if (is_custom_counts_histogram) { | 1143   if (is_custom_counts_histogram) { | 
| 1152     uma.HistogramCustomCounts(histogram_name, value, histogram_min, | 1144     uma.HistogramCustomCounts(histogram_name, value, histogram_min, | 
| 1153                               histogram_max, histogram_buckets); | 1145                               histogram_max, histogram_buckets); | 
| 1154   } else { | 1146   } else { | 
| 1155     uma.HistogramCustomTimes(histogram_name, value, histogram_min, | 1147     uma.HistogramCustomTimes(histogram_name, value, histogram_min, | 
| 1156                              histogram_max, histogram_buckets); | 1148                              histogram_max, histogram_buckets); | 
| 1157   } | 1149   } | 
| 1158 } | 1150 } | 
| 1159 | 1151 | 
| 1160 }  // namespace remoting | 1152 }  // namespace remoting | 
| OLD | NEW | 
|---|