summaryrefslogtreecommitdiffstats
path: root/content/renderer/p2p
diff options
context:
space:
mode:
Diffstat (limited to 'content/renderer/p2p')
-rw-r--r--content/renderer/p2p/ipc_network_manager.h6
-rw-r--r--content/renderer/p2p/ipc_network_manager_unittest.cc4
-rw-r--r--content/renderer/p2p/ipc_socket_factory.cc38
-rw-r--r--content/renderer/p2p/ipc_socket_factory.h8
-rw-r--r--content/renderer/p2p/port_allocator.h4
-rw-r--r--content/renderer/p2p/socket_client_impl.h12
-rw-r--r--content/renderer/p2p/socket_dispatcher.h12
7 files changed, 42 insertions, 42 deletions
diff --git a/content/renderer/p2p/ipc_network_manager.h b/content/renderer/p2p/ipc_network_manager.h
index 58f29cd..ae2e4d2 100644
--- a/content/renderer/p2p/ipc_network_manager.h
+++ b/content/renderer/p2p/ipc_network_manager.h
@@ -25,12 +25,12 @@ class IpcNetworkManager : public rtc::NetworkManagerBase,
CONTENT_EXPORT IpcNetworkManager(NetworkListManager* network_list_manager);
virtual ~IpcNetworkManager();
- virtual void StartUpdating() OVERRIDE;
- virtual void StopUpdating() OVERRIDE;
+ virtual void StartUpdating() override;
+ virtual void StopUpdating() override;
// P2PSocketDispatcher::NetworkListObserver interface.
virtual void OnNetworkListChanged(
- const net::NetworkInterfaceList& list) OVERRIDE;
+ const net::NetworkInterfaceList& list) override;
private:
void SendNetworksChangedSignal();
diff --git a/content/renderer/p2p/ipc_network_manager_unittest.cc b/content/renderer/p2p/ipc_network_manager_unittest.cc
index d2fbea4..9fdd456 100644
--- a/content/renderer/p2p/ipc_network_manager_unittest.cc
+++ b/content/renderer/p2p/ipc_network_manager_unittest.cc
@@ -15,10 +15,10 @@ namespace {
class MockP2PSocketDispatcher : public NetworkListManager {
public:
virtual void AddNetworkListObserver(
- NetworkListObserver* network_list_observer) OVERRIDE {}
+ NetworkListObserver* network_list_observer) override {}
virtual void RemoveNetworkListObserver(
- NetworkListObserver* network_list_observer) OVERRIDE {}
+ NetworkListObserver* network_list_observer) override {}
virtual ~MockP2PSocketDispatcher() {}
};
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 3055016..5611a3d 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -78,31 +78,31 @@ class IpcPacketSocket : public rtc::AsyncPacketSocket,
const rtc::SocketAddress& remote_address);
// rtc::AsyncPacketSocket interface.
- virtual rtc::SocketAddress GetLocalAddress() const OVERRIDE;
- virtual rtc::SocketAddress GetRemoteAddress() const OVERRIDE;
+ virtual rtc::SocketAddress GetLocalAddress() const override;
+ virtual rtc::SocketAddress GetRemoteAddress() const override;
virtual int Send(const void *pv, size_t cb,
- const rtc::PacketOptions& options) OVERRIDE;
+ const rtc::PacketOptions& options) override;
virtual int SendTo(const void *pv, size_t cb,
const rtc::SocketAddress& addr,
- const rtc::PacketOptions& options) OVERRIDE;
- virtual int Close() OVERRIDE;
- virtual State GetState() const OVERRIDE;
- virtual int GetOption(rtc::Socket::Option option, int* value) OVERRIDE;
- virtual int SetOption(rtc::Socket::Option option, int value) OVERRIDE;
- virtual int GetError() const OVERRIDE;
- virtual void SetError(int error) OVERRIDE;
+ const rtc::PacketOptions& options) override;
+ virtual int Close() override;
+ virtual State GetState() const override;
+ virtual int GetOption(rtc::Socket::Option option, int* value) override;
+ virtual int SetOption(rtc::Socket::Option option, int value) override;
+ virtual int GetError() const override;
+ virtual void SetError(int error) override;
// P2PSocketClientDelegate implementation.
virtual void OnOpen(const net::IPEndPoint& local_address,
- const net::IPEndPoint& remote_address) OVERRIDE;
+ const net::IPEndPoint& remote_address) override;
virtual void OnIncomingTcpConnection(
const net::IPEndPoint& address,
- P2PSocketClient* client) OVERRIDE;
- virtual void OnSendComplete() OVERRIDE;
- virtual void OnError() OVERRIDE;
+ P2PSocketClient* client) override;
+ virtual void OnSendComplete() override;
+ virtual void OnError() override;
virtual void OnDataReceived(const net::IPEndPoint& address,
const std::vector<char>& data,
- const base::TimeTicks& timestamp) OVERRIDE;
+ const base::TimeTicks& timestamp) override;
private:
enum InternalState {
@@ -175,11 +175,11 @@ class AsyncAddressResolverImpl : public base::NonThreadSafe,
virtual ~AsyncAddressResolverImpl();
// rtc::AsyncResolverInterface interface.
- virtual void Start(const rtc::SocketAddress& addr) OVERRIDE;
+ virtual void Start(const rtc::SocketAddress& addr) override;
virtual bool GetResolvedAddress(
- int family, rtc::SocketAddress* addr) const OVERRIDE;
- virtual int GetError() const OVERRIDE;
- virtual void Destroy(bool wait) OVERRIDE;
+ int family, rtc::SocketAddress* addr) const override;
+ virtual int GetError() const override;
+ virtual void Destroy(bool wait) override;
private:
virtual void OnAddressResolved(const net::IPAddressList& addresses);
diff --git a/content/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h
index 53e1edc..74db1e6 100644
--- a/content/renderer/p2p/ipc_socket_factory.h
+++ b/content/renderer/p2p/ipc_socket_factory.h
@@ -28,19 +28,19 @@ class IpcPacketSocketFactory : public rtc::PacketSocketFactory {
virtual rtc::AsyncPacketSocket* CreateUdpSocket(
const rtc::SocketAddress& local_address,
- int min_port, int max_port) OVERRIDE;
+ int min_port, int max_port) override;
virtual rtc::AsyncPacketSocket* CreateServerTcpSocket(
const rtc::SocketAddress& local_address,
int min_port,
int max_port,
- int opts) OVERRIDE;
+ int opts) override;
virtual rtc::AsyncPacketSocket* CreateClientTcpSocket(
const rtc::SocketAddress& local_address,
const rtc::SocketAddress& remote_address,
const rtc::ProxyInfo& proxy_info,
const std::string& user_agent,
- int opts) OVERRIDE;
- virtual rtc::AsyncResolverInterface* CreateAsyncResolver() OVERRIDE;
+ int opts) override;
+ virtual rtc::AsyncResolverInterface* CreateAsyncResolver() override;
private:
P2PSocketDispatcher* socket_dispatcher_;
diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h
index c08b5ae..49563fa 100644
--- a/content/renderer/p2p/port_allocator.h
+++ b/content/renderer/p2p/port_allocator.h
@@ -48,7 +48,7 @@ class P2PPortAllocator : public cricket::BasicPortAllocator {
const std::string& content_name,
int component,
const std::string& ice_username_fragment,
- const std::string& ice_password) OVERRIDE;
+ const std::string& ice_password) override;
private:
friend class P2PPortAllocatorSession;
@@ -71,7 +71,7 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession {
protected:
// Overrides for cricket::BasicPortAllocatorSession.
- virtual void GetPortConfigurations() OVERRIDE;
+ virtual void GetPortConfigurations() override;
private:
P2PPortAllocator* allocator_;
diff --git a/content/renderer/p2p/socket_client_impl.h b/content/renderer/p2p/socket_client_impl.h
index 89e48c0..399d533 100644
--- a/content/renderer/p2p/socket_client_impl.h
+++ b/content/renderer/p2p/socket_client_impl.h
@@ -41,24 +41,24 @@ class P2PSocketClientImpl : public P2PSocketClient {
// Send the |data| to the |address|.
virtual void Send(const net::IPEndPoint& address,
- const std::vector<char>& data) OVERRIDE;
+ const std::vector<char>& data) override;
// Send the |data| to the |address| using Differentiated Services Code Point
// |dscp|.
virtual void SendWithDscp(const net::IPEndPoint& address,
const std::vector<char>& data,
- const rtc::PacketOptions& options) OVERRIDE;
+ const rtc::PacketOptions& options) override;
// Setting socket options.
- virtual void SetOption(P2PSocketOption option, int value) OVERRIDE;
+ virtual void SetOption(P2PSocketOption option, int value) override;
// Must be called before the socket is destroyed. The delegate may
// not be called after |closed_task| is executed.
- virtual void Close() OVERRIDE;
+ virtual void Close() override;
- virtual int GetSocketID() const OVERRIDE;
+ virtual int GetSocketID() const override;
- virtual void SetDelegate(P2PSocketClientDelegate* delegate) OVERRIDE;
+ virtual void SetDelegate(P2PSocketClientDelegate* delegate) override;
private:
enum State {
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index 61a2d3b..24999dc 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -56,9 +56,9 @@ class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter,
// NetworkListManager interface:
virtual void AddNetworkListObserver(
- NetworkListObserver* network_list_observer) OVERRIDE;
+ NetworkListObserver* network_list_observer) override;
virtual void RemoveNetworkListObserver(
- NetworkListObserver* network_list_observer) OVERRIDE;
+ NetworkListObserver* network_list_observer) override;
protected:
virtual ~P2PSocketDispatcher();
@@ -71,10 +71,10 @@ class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter,
virtual void Send(IPC::Message* message);
// IPC::MessageFilter override. Called on IO thread.
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
- virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE;
- virtual void OnFilterRemoved() OVERRIDE;
- virtual void OnChannelClosing() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
+ virtual void OnFilterAdded(IPC::Sender* sender) override;
+ virtual void OnFilterRemoved() override;
+ virtual void OnChannelClosing() override;
// Returns the IO message loop.
base::MessageLoopProxy* message_loop();
generated by cgit v1.1 at 2025-02-14 13:18:53 +0000