Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(340)

Side by Side Diff: remoting/client/plugin/chromoting_instance.cc

Issue 2798393007: Use SignalingAddress in SignalStrategy insterface. (Closed)
Patch Set: header Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/client/chromoting_client.cc ('k') | remoting/host/gcd_state_updater.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 668
669 client_.reset(new ChromotingClient(&context_, this, video_renderer_.get(), 669 client_.reset(new ChromotingClient(&context_, this, video_renderer_.get(),
670 audio_player_->GetWeakPtr())); 670 audio_player_->GetWeakPtr()));
671 std::string host_experiment_config; 671 std::string host_experiment_config;
672 if (data.GetString("hostConfiguration", &host_experiment_config)) { 672 if (data.GetString("hostConfiguration", &host_experiment_config)) {
673 client_->set_host_experiment_config(host_experiment_config); 673 client_->set_host_experiment_config(host_experiment_config);
674 } 674 }
675 675
676 // Setup the signal strategy. 676 // Setup the signal strategy.
677 signal_strategy_.reset(new DelegatingSignalStrategy( 677 signal_strategy_.reset(new DelegatingSignalStrategy(
678 local_jid, plugin_task_runner_, 678 SignalingAddress(local_jid), plugin_task_runner_,
679 base::Bind(&ChromotingInstance::SendOutgoingIq, 679 base::Bind(&ChromotingInstance::SendOutgoingIq,
680 weak_factory_.GetWeakPtr()))); 680 weak_factory_.GetWeakPtr())));
681 681
682 // Create TransportContext. 682 // Create TransportContext.
683 scoped_refptr<protocol::TransportContext> transport_context( 683 scoped_refptr<protocol::TransportContext> transport_context(
684 new protocol::TransportContext( 684 new protocol::TransportContext(
685 signal_strategy_.get(), 685 signal_strategy_.get(),
686 base::MakeUnique<PepperPortAllocatorFactory>(this), 686 base::MakeUnique<PepperPortAllocatorFactory>(this),
687 base::MakeUnique<PepperUrlRequestFactory>(this), 687 base::MakeUnique<PepperUrlRequestFactory>(this),
688 protocol::NetworkSettings( 688 protocol::NetworkSettings(
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 if (is_custom_counts_histogram) { 1131 if (is_custom_counts_histogram) {
1132 uma.HistogramCustomCounts(histogram_name, value, histogram_min, 1132 uma.HistogramCustomCounts(histogram_name, value, histogram_min,
1133 histogram_max, histogram_buckets); 1133 histogram_max, histogram_buckets);
1134 } else { 1134 } else {
1135 uma.HistogramCustomTimes(histogram_name, value, histogram_min, 1135 uma.HistogramCustomTimes(histogram_name, value, histogram_min,
1136 histogram_max, histogram_buckets); 1136 histogram_max, histogram_buckets);
1137 } 1137 }
1138 } 1138 }
1139 1139
1140 } // namespace remoting 1140 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/chromoting_client.cc ('k') | remoting/host/gcd_state_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698