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

Side by Side Diff: remoting/signaling/fake_signal_strategy.cc

Issue 545003004: Roll WebRTC 7011:7046 libjingle: 7007:7045 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/signaling/DEPS ('k') | remoting/signaling/iq_sender.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/signaling/fake_signal_strategy.h" 5 #include "remoting/signaling/fake_signal_strategy.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/thread_task_runner_handle.h"
14 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
15 #include "third_party/libjingle/source/talk/xmpp/constants.h" 14 #include "third_party/libjingle/source/talk/xmpp/constants.h"
15 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
16 16
17 namespace remoting { 17 namespace remoting {
18 18
19 // static 19 // static
20 void FakeSignalStrategy::Connect(FakeSignalStrategy* peer1, 20 void FakeSignalStrategy::Connect(FakeSignalStrategy* peer1,
21 FakeSignalStrategy* peer2) { 21 FakeSignalStrategy* peer2) {
22 DCHECK(peer1->main_thread_->BelongsToCurrentThread()); 22 DCHECK(peer1->main_thread_->BelongsToCurrentThread());
23 DCHECK(peer2->main_thread_->BelongsToCurrentThread()); 23 DCHECK(peer2->main_thread_->BelongsToCurrentThread());
24 peer1->ConnectTo(peer2); 24 peer1->ConnectTo(peer2);
25 peer2->ConnectTo(peer1); 25 peer2->ConnectTo(peer1);
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 if (listener->OnSignalStrategyIncomingStanza(stanza_ptr)) 140 if (listener->OnSignalStrategyIncomingStanza(stanza_ptr))
141 break; 141 break;
142 } 142 }
143 } 143 }
144 144
145 void FakeSignalStrategy::SetPeerCallback(const PeerCallback& peer_callback) { 145 void FakeSignalStrategy::SetPeerCallback(const PeerCallback& peer_callback) {
146 peer_callback_ = peer_callback; 146 peer_callback_ = peer_callback;
147 } 147 }
148 148
149 } // namespace remoting 149 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/signaling/DEPS ('k') | remoting/signaling/iq_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698