remoting/protocol/jingle_session_manager.h - Issue 429113002: Webrtc deps roll.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/protocol/jingle_session_manager.h

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 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:

Index: remoting/protocol/jingle_session_manager.h

diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h

index 0193523fc123af78dc79ae5d3bd56320fe4c2902..89df6136bfa8074c1c723812f0ca872abbb24814 100644

--- a/remoting/protocol/jingle_session_manager.h

+++ b/remoting/protocol/jingle_session_manager.h

@@ -23,9 +23,9 @@ namespace buzz {

class XmlElement;

} // namespace buzz

-namespace talk_base {

+namespace rtc {

class SocketAddress;

-} // namespace talk_base

+} // namespace rtc

namespace remoting {

@@ -71,7 +71,7 @@ class JingleSessionManager : public SessionManager,

void OnJingleInfo(

const std::string& relay_token,

const std::vector<std::string>& relay_hosts,

- const std::vector<talk_base::SocketAddress>& stun_hosts);

+ const std::vector<rtc::SocketAddress>& stun_hosts);

IqSender* iq_sender() { return iq_sender_.get(); }

void SendReply(const buzz::XmlElement* original_stanza,

« no previous file with comments | « remoting/protocol/jingle_messages.cc ('k') | remoting/protocol/jingle_session_manager.cc » ('j') | no next file with comments »