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

Unified Diff: Source/modules/mediastream/RTCPeerConnection.h

Issue 461163002: Cleanup namespace usage in Source/core/modules/[mediasource/* to websockets/*] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/mediastream/RTCIceCandidate.h ('k') | Source/modules/mediastream/RTCSessionDescription.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediastream/RTCPeerConnection.h
diff --git a/Source/modules/mediastream/RTCPeerConnection.h b/Source/modules/mediastream/RTCPeerConnection.h
index 0a0b686383ec475490ff960b8af150238de04cbd..34d4afcb1883c6ec357d8db633368cd17a0b89a1 100644
--- a/Source/modules/mediastream/RTCPeerConnection.h
+++ b/Source/modules/mediastream/RTCPeerConnection.h
@@ -57,7 +57,7 @@ class VoidCallback;
class RTCPeerConnection FINAL
: public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<RTCPeerConnection>
- , public blink::WebRTCPeerConnectionHandlerClient
+ , public WebRTCPeerConnectionHandlerClient
, public EventTargetWithInlineData
, public ActiveDOMObject {
DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<RTCPeerConnection>);
@@ -119,15 +119,15 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(iceconnectionstatechange);
DEFINE_ATTRIBUTE_EVENT_LISTENER(datachannel);
- // blink::WebRTCPeerConnectionHandlerClient
+ // WebRTCPeerConnectionHandlerClient
virtual void negotiationNeeded() OVERRIDE;
- virtual void didGenerateICECandidate(const blink::WebRTCICECandidate&) OVERRIDE;
+ virtual void didGenerateICECandidate(const WebRTCICECandidate&) OVERRIDE;
virtual void didChangeSignalingState(SignalingState) OVERRIDE;
virtual void didChangeICEGatheringState(ICEGatheringState) OVERRIDE;
virtual void didChangeICEConnectionState(ICEConnectionState) OVERRIDE;
- virtual void didAddRemoteStream(const blink::WebMediaStream&) OVERRIDE;
- virtual void didRemoveRemoteStream(const blink::WebMediaStream&) OVERRIDE;
- virtual void didAddRemoteDataChannel(blink::WebRTCDataChannelHandler*) OVERRIDE;
+ virtual void didAddRemoteStream(const WebMediaStream&) OVERRIDE;
+ virtual void didRemoveRemoteStream(const WebMediaStream&) OVERRIDE;
+ virtual void didAddRemoteDataChannel(WebRTCDataChannelHandler*) OVERRIDE;
virtual void releasePeerConnectionHandler() OVERRIDE;
// EventTarget
@@ -147,7 +147,7 @@ public:
virtual void trace(Visitor*) OVERRIDE;
private:
- RTCPeerConnection(ExecutionContext*, PassRefPtr<RTCConfiguration>, blink::WebMediaConstraints, ExceptionState&);
+ RTCPeerConnection(ExecutionContext*, PassRefPtr<RTCConfiguration>, WebMediaConstraints, ExceptionState&);
static PassRefPtr<RTCConfiguration> parseConfiguration(const Dictionary&, ExceptionState&);
static PassRefPtr<RTCOfferOptions> parseOfferOptions(const Dictionary&, ExceptionState&);
@@ -156,9 +156,9 @@ private:
void dispatchScheduledEvent();
bool hasLocalStreamWithTrackId(const String& trackId);
- void changeSignalingState(blink::WebRTCPeerConnectionHandlerClient::SignalingState);
- void changeIceGatheringState(blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState);
- void changeIceConnectionState(blink::WebRTCPeerConnectionHandlerClient::ICEConnectionState);
+ void changeSignalingState(WebRTCPeerConnectionHandlerClient::SignalingState);
+ void changeIceGatheringState(WebRTCPeerConnectionHandlerClient::ICEGatheringState);
+ void changeIceConnectionState(WebRTCPeerConnectionHandlerClient::ICEConnectionState);
SignalingState m_signalingState;
ICEGatheringState m_iceGatheringState;
@@ -169,7 +169,7 @@ private:
HeapVector<Member<RTCDataChannel> > m_dataChannels;
- OwnPtr<blink::WebRTCPeerConnectionHandler> m_peerHandler;
+ OwnPtr<WebRTCPeerConnectionHandler> m_peerHandler;
AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner;
WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;
« no previous file with comments | « Source/modules/mediastream/RTCIceCandidate.h ('k') | Source/modules/mediastream/RTCSessionDescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698