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

Side by Side Diff: remoting/client/plugin/pepper_util.h

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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:
View unified diff | Download patch
« no previous file with comments | « remoting/client/plugin/pepper_port_allocator.cc ('k') | remoting/client/plugin/pepper_util.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef REMOTING_CLIENT_PLUGIN_PLUGIN_UTIL_H_ 5 #ifndef REMOTING_CLIENT_PLUGIN_PLUGIN_UTIL_H_
6 #define REMOTING_CLIENT_PLUGIN_PLUGIN_UTIL_H_ 6 #define REMOTING_CLIENT_PLUGIN_PLUGIN_UTIL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
11 11
12 namespace pp { 12 namespace pp {
13 class InstanceHandle; 13 class InstanceHandle;
14 class NetAddress; 14 class NetAddress;
15 } 15 }
16 16
17 namespace rtc { 17 namespace talk_base {
18 class SocketAddress; 18 class SocketAddress;
19 } 19 }
20 20
21 namespace remoting { 21 namespace remoting {
22 22
23 // Helpers to convert between different socket address representations. 23 // Helpers to convert between different socket address representations.
24 bool SocketAddressToPpNetAddressWithPort( 24 bool SocketAddressToPpNetAddressWithPort(
25 const pp::InstanceHandle& instance, 25 const pp::InstanceHandle& instance,
26 const rtc::SocketAddress& address, 26 const talk_base::SocketAddress& address,
27 pp::NetAddress* pp_net_address, 27 pp::NetAddress* pp_net_address,
28 uint16_t port); 28 uint16_t port);
29 bool SocketAddressToPpNetAddress(const pp::InstanceHandle& instance, 29 bool SocketAddressToPpNetAddress(const pp::InstanceHandle& instance,
30 const rtc::SocketAddress& address, 30 const talk_base::SocketAddress& address,
31 pp::NetAddress* pp_net_address); 31 pp::NetAddress* pp_net_address);
32 void PpNetAddressToSocketAddress(const pp::NetAddress& pp_net_address, 32 void PpNetAddressToSocketAddress(const pp::NetAddress& pp_net_address,
33 rtc::SocketAddress* address); 33 talk_base::SocketAddress* address);
34 34
35 } // namespace remoting 35 } // namespace remoting
36 36
37 #endif // REMOTING_CLIENT_PLUGIN_PLUGIN_UTIL_H_ 37 #endif // REMOTING_CLIENT_PLUGIN_PLUGIN_UTIL_H_
OLDNEW
« no previous file with comments | « remoting/client/plugin/pepper_port_allocator.cc ('k') | remoting/client/plugin/pepper_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698