content/renderer/p2p/ipc_network_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: content/renderer/p2p/ipc_network_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: content/renderer/p2p/ipc_network_manager.h

diff --git a/content/renderer/p2p/ipc_network_manager.h b/content/renderer/p2p/ipc_network_manager.h

index 06931dc7f465df35a1e27bd647cae1f15ff895da..4ed3c48a03fbebecb622bf233bc6512d2ec35554 100644

--- a/content/renderer/p2p/ipc_network_manager.h

+++ b/content/renderer/p2p/ipc_network_manager.h

@@ -12,13 +12,13 @@

#include "content/common/content_export.h"

#include "content/renderer/p2p/network_list_observer.h"

#include "content/renderer/p2p/socket_dispatcher.h"

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

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

namespace content {

// IpcNetworkManager is a NetworkManager for libjingle that gets a

// list of network interfaces from the browser.

-class IpcNetworkManager : public talk_base::NetworkManagerBase,

+class IpcNetworkManager : public rtc::NetworkManagerBase,

public NetworkListObserver {

public:

// Constructor doesn't take ownership of the |socket_dispatcher|.