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

Side by Side Diff: remoting/protocol/libjingle_transport_factory.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 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 | Annotate | Revision Log
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/protocol/libjingle_transport_factory.h" 5 #include "remoting/protocol/libjingle_transport_factory.h"
6 6
7 #include "base/single_thread_task_runner.h" 7 #include "base/single_thread_task_runner.h"
8 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
9 #include "jingle/glue/channel_socket_adapter.h" 9 #include "jingle/glue/channel_socket_adapter.h"
10 #include "jingle/glue/pseudotcp_adapter.h" 10 #include "jingle/glue/pseudotcp_adapter.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 const StreamTransport::ConnectedCallback& callback) { 132 const StreamTransport::ConnectedCallback& callback) {
133 DCHECK(CalledOnValidThread()); 133 DCHECK(CalledOnValidThread());
134 134
135 callback_ = callback; 135 callback_ = callback;
136 136
137 DCHECK(!channel_.get()); 137 DCHECK(!channel_.get());
138 138
139 // Create P2PTransportChannel, attach signal handlers and connect it. 139 // Create P2PTransportChannel, attach signal handlers and connect it.
140 // TODO(sergeyu): Specify correct component ID for the channel. 140 // TODO(sergeyu): Specify correct component ID for the channel.
141 channel_.reset(new cricket::P2PTransportChannel( 141 channel_.reset(new cricket::P2PTransportChannel(
142 "", 0, NULL, port_allocator_)); 142 std::string(), 0, NULL, port_allocator_));
143 channel_->SetIceCredentials(ice_username_fragment_, ice_password_); 143 channel_->SetIceCredentials(ice_username_fragment_, ice_password_);
144 channel_->SignalRequestSignaling.connect( 144 channel_->SignalRequestSignaling.connect(
145 this, &LibjingleStreamTransport::OnRequestSignaling); 145 this, &LibjingleStreamTransport::OnRequestSignaling);
146 channel_->SignalCandidateReady.connect( 146 channel_->SignalCandidateReady.connect(
147 this, &LibjingleStreamTransport::OnCandidateReady); 147 this, &LibjingleStreamTransport::OnCandidateReady);
148 channel_->SignalRouteChange.connect( 148 channel_->SignalRouteChange.connect(
149 this, &LibjingleStreamTransport::OnRouteChange); 149 this, &LibjingleStreamTransport::OnRouteChange);
150 channel_->SignalWritableState.connect( 150 channel_->SignalWritableState.connect(
151 this, &LibjingleStreamTransport::OnWritableState); 151 this, &LibjingleStreamTransport::OnWritableState);
152 channel_->set_incoming_only(incoming_only_); 152 channel_->set_incoming_only(incoming_only_);
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 } 365 }
366 366
367 scoped_ptr<DatagramTransport> 367 scoped_ptr<DatagramTransport>
368 LibjingleTransportFactory::CreateDatagramTransport() { 368 LibjingleTransportFactory::CreateDatagramTransport() {
369 NOTIMPLEMENTED(); 369 NOTIMPLEMENTED();
370 return scoped_ptr<DatagramTransport>(NULL); 370 return scoped_ptr<DatagramTransport>(NULL);
371 } 371 }
372 372
373 } // namespace protocol 373 } // namespace protocol
374 } // namespace remoting 374 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session_unittest.cc ('k') | remoting/protocol/third_party_authenticator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698