remoting/client/plugin/pepper_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: remoting/client/plugin/pepper_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: remoting/client/plugin/pepper_network_manager.h

diff --git a/remoting/client/plugin/pepper_network_manager.h b/remoting/client/plugin/pepper_network_manager.h

index 7711eed662bc62fbd71b8d8ebefbe6ecc36ceee4..639fb74998152fec8ba3ec90aba6aa84088d60de 100644

--- a/remoting/client/plugin/pepper_network_manager.h

+++ b/remoting/client/plugin/pepper_network_manager.h

@@ -10,7 +10,7 @@

#include "ppapi/cpp/instance_handle.h"

#include "ppapi/cpp/network_monitor.h"

#include "ppapi/utility/completion_callback_factory.h"

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

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

namespace pp {

class NetworkList;

@@ -21,7 +21,7 @@ namespace remoting {

// PepperNetworkManager uses the PPB_NetworkMonitor API to

// implement the NetworkManager interface that libjingle uses to

// monitor the host system's network interfaces.

-class PepperNetworkManager : public talk_base::NetworkManagerBase {

+class PepperNetworkManager : public rtc::NetworkManagerBase {

public:

PepperNetworkManager(const pp::InstanceHandle& instance);

virtual ~PepperNetworkManager();