jingle/glue/channel_socket_adapter.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: jingle/glue/channel_socket_adapter.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: jingle/glue/channel_socket_adapter.h

diff --git a/jingle/glue/channel_socket_adapter.h b/jingle/glue/channel_socket_adapter.h

index fc90df927db9ccbc2fed92c5b5da1ee77b6b14f2..8bd330f3e3ec337c2617a5115a925ddac6c3c72e 100644

--- a/jingle/glue/channel_socket_adapter.h

+++ b/jingle/glue/channel_socket_adapter.h

@@ -8,9 +8,9 @@

#include "base/callback_forward.h"

#include "base/compiler_specific.h"

#include "net/socket/socket.h"

-#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"

-#include "third_party/libjingle/source/talk/base/socketaddress.h"

-#include "third_party/libjingle/source/talk/base/sigslot.h"

+#include "third_party/webrtc/base/asyncpacketsocket.h"

+#include "third_party/webrtc/base/sigslot.h"

+#include "third_party/webrtc/base/socketaddress.h"

namespace base {

class MessageLoop;

@@ -55,7 +55,7 @@ class TransportChannelSocketAdapter : public net::Socket,

void OnNewPacket(cricket::TransportChannel* channel,

const char* data,

size_t data_size,

- const talk_base::PacketTime& packet_time,

+ const rtc::PacketTime& packet_time,

int flags);

void OnWritableState(cricket::TransportChannel* channel);

void OnChannelDestroyed(cricket::TransportChannel* channel);

« no previous file with comments | « jingle/glue/DEPS ('k') | jingle/glue/channel_socket_adapter.cc » ('j') | no next file with comments »