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

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

Issue 1085703003: Use standard ICE in Chromoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crash on memory bots Created 5 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/jni/chromoting_jni_instance.cc ('k') | remoting/host/chromoting_host.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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #if defined(OS_NACL) 10 #if defined(OS_NACL)
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 } 705 }
706 706
707 // Setup the signal strategy. 707 // Setup the signal strategy.
708 signal_strategy_.reset(new DelegatingSignalStrategy( 708 signal_strategy_.reset(new DelegatingSignalStrategy(
709 local_jid, base::Bind(&ChromotingInstance::SendOutgoingIq, 709 local_jid, base::Bind(&ChromotingInstance::SendOutgoingIq,
710 weak_factory_.GetWeakPtr()))); 710 weak_factory_.GetWeakPtr())));
711 711
712 // Create TransportFactory. 712 // Create TransportFactory.
713 scoped_ptr<protocol::TransportFactory> transport_factory( 713 scoped_ptr<protocol::TransportFactory> transport_factory(
714 new protocol::LibjingleTransportFactory( 714 new protocol::LibjingleTransportFactory(
715 signal_strategy_.get(), 715 signal_strategy_.get(), PepperPortAllocator::Create(this).Pass(),
716 PepperPortAllocator::Create(this).Pass(),
717 protocol::NetworkSettings( 716 protocol::NetworkSettings(
718 protocol::NetworkSettings::NAT_TRAVERSAL_FULL))); 717 protocol::NetworkSettings::NAT_TRAVERSAL_FULL),
718 protocol::TransportRole::CLIENT));
719 719
720 // Create Authenticator. 720 // Create Authenticator.
721 scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher> 721 scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
722 token_fetcher(new TokenFetcherProxy( 722 token_fetcher(new TokenFetcherProxy(
723 base::Bind(&ChromotingInstance::FetchThirdPartyToken, 723 base::Bind(&ChromotingInstance::FetchThirdPartyToken,
724 weak_factory_.GetWeakPtr()), 724 weak_factory_.GetWeakPtr()),
725 host_public_key)); 725 host_public_key));
726 scoped_ptr<protocol::Authenticator> authenticator( 726 scoped_ptr<protocol::Authenticator> authenticator(
727 new protocol::NegotiatingClientAuthenticator( 727 new protocol::NegotiatingClientAuthenticator(
728 client_pairing_id, client_paired_secret, authentication_tag, 728 client_pairing_id, client_paired_secret, authentication_tag,
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 1190
1191 #if !defined(OS_NACL) 1191 #if !defined(OS_NACL)
1192 // Log messages are forwarded to the webapp only in PNaCl version of the 1192 // Log messages are forwarded to the webapp only in PNaCl version of the
1193 // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl 1193 // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl
1194 // version. 1194 // version.
1195 ProcessLogToUI(message); 1195 ProcessLogToUI(message);
1196 #endif // !defined(OS_NACL) 1196 #endif // !defined(OS_NACL)
1197 } 1197 }
1198 1198
1199 } // namespace remoting 1199 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/jni/chromoting_jni_instance.cc ('k') | remoting/host/chromoting_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698