Fix typo by renaming RTCSessionDescriptonDelegate -> RTCSessionsDescriptionDelegate
R=fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12059004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5946 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/app/webrtc/objc/RTCPeerConnection.mm b/talk/app/webrtc/objc/RTCPeerConnection.mm
index a7e31a1..9188653 100644
--- a/talk/app/webrtc/objc/RTCPeerConnection.mm
+++ b/talk/app/webrtc/objc/RTCPeerConnection.mm
@@ -37,7 +37,7 @@
#import "RTCMediaConstraints+Internal.h"
#import "RTCMediaStream+Internal.h"
#import "RTCSessionDescription+Internal.h"
-#import "RTCSessionDescriptonDelegate.h"
+#import "RTCSessionDescriptionDelegate.h"
#import "RTCSessionDescription.h"
#include "talk/app/webrtc/jsep.h"
@@ -50,8 +50,9 @@
class RTCCreateSessionDescriptionObserver
: public CreateSessionDescriptionObserver {
public:
- RTCCreateSessionDescriptionObserver(id<RTCSessionDescriptonDelegate> delegate,
- RTCPeerConnection* peerConnection) {
+ RTCCreateSessionDescriptionObserver(
+ id<RTCSessionDescriptionDelegate> delegate,
+ RTCPeerConnection* peerConnection) {
_delegate = delegate;
_peerConnection = peerConnection;
}
@@ -76,13 +77,13 @@
}
private:
- id<RTCSessionDescriptonDelegate> _delegate;
+ id<RTCSessionDescriptionDelegate> _delegate;
RTCPeerConnection* _peerConnection;
};
class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver {
public:
- RTCSetSessionDescriptionObserver(id<RTCSessionDescriptonDelegate> delegate,
+ RTCSetSessionDescriptionObserver(id<RTCSessionDescriptionDelegate> delegate,
RTCPeerConnection* peerConnection) {
_delegate = delegate;
_peerConnection = peerConnection;
@@ -104,7 +105,7 @@
}
private:
- id<RTCSessionDescriptonDelegate> _delegate;
+ id<RTCSessionDescriptionDelegate> _delegate;
RTCPeerConnection* _peerConnection;
};
}
@@ -132,7 +133,7 @@
return YES;
}
-- (void)createAnswerWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate
+- (void)createAnswerWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
constraints:(RTCMediaConstraints*)constraints {
talk_base::scoped_refptr<webrtc::RTCCreateSessionDescriptionObserver>
observer(new talk_base::RefCountedObject<
@@ -140,7 +141,7 @@
self.peerConnection->CreateAnswer(observer, constraints.constraints);
}
-- (void)createOfferWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate
+- (void)createOfferWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
constraints:(RTCMediaConstraints*)constraints {
talk_base::scoped_refptr<webrtc::RTCCreateSessionDescriptionObserver>
observer(new talk_base::RefCountedObject<
@@ -154,7 +155,7 @@
}
- (void)setLocalDescriptionWithDelegate:
- (id<RTCSessionDescriptonDelegate>)delegate
+ (id<RTCSessionDescriptionDelegate>)delegate
sessionDescription:(RTCSessionDescription*)sdp {
talk_base::scoped_refptr<webrtc::RTCSetSessionDescriptionObserver> observer(
new talk_base::RefCountedObject<webrtc::RTCSetSessionDescriptionObserver>(
@@ -163,7 +164,7 @@
}
- (void)setRemoteDescriptionWithDelegate:
- (id<RTCSessionDescriptonDelegate>)delegate
+ (id<RTCSessionDescriptionDelegate>)delegate
sessionDescription:(RTCSessionDescription*)sdp {
talk_base::scoped_refptr<webrtc::RTCSetSessionDescriptionObserver> observer(
new talk_base::RefCountedObject<webrtc::RTCSetSessionDescriptionObserver>(
diff --git a/talk/app/webrtc/objc/public/RTCPeerConnection.h b/talk/app/webrtc/objc/public/RTCPeerConnection.h
index c66bac8..45e0a93 100644
--- a/talk/app/webrtc/objc/public/RTCPeerConnection.h
+++ b/talk/app/webrtc/objc/public/RTCPeerConnection.h
@@ -32,7 +32,7 @@
@class RTCMediaConstraints;
@class RTCMediaStream;
@class RTCSessionDescription;
-@protocol RTCSessionDescriptonDelegate;
+@protocol RTCSessionDescriptionDelegate;
// RTCPeerConnection is an ObjectiveC friendly wrapper around a PeerConnection
// object. See the documentation in talk/app/webrtc/peerconnectioninterface.h.
@@ -67,25 +67,25 @@
- (void)removeStream:(RTCMediaStream *)stream;
// Create a new offer.
-// Success or failure will be reported via RTCSessionDescriptonDelegate.
-- (void)createOfferWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate
+// Success or failure will be reported via RTCSessionDescriptionDelegate.
+- (void)createOfferWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
constraints:(RTCMediaConstraints *)constraints;
// Create an answer to an offer.
-// Success or failure will be reported via RTCSessionDescriptonDelegate.
-- (void)createAnswerWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate
+// Success or failure will be reported via RTCSessionDescriptionDelegate.
+- (void)createAnswerWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
constraints:(RTCMediaConstraints *)constraints;
// Sets the local session description.
-// Success or failure will be reported via RTCSessionDescriptonDelegate.
+// Success or failure will be reported via RTCSessionDescriptionDelegate.
- (void)
- setLocalDescriptionWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate
+ setLocalDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
sessionDescription:(RTCSessionDescription *)sdp;
// Sets the remote session description.
-// Success or failure will be reported via RTCSessionDescriptonDelegate.
+// Success or failure will be reported via RTCSessionDescriptionDelegate.
- (void)
- setRemoteDescriptionWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate
+ setRemoteDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
sessionDescription:(RTCSessionDescription *)sdp;
// Restarts or updates the ICE Agent process of gathering local candidates
diff --git a/talk/app/webrtc/objc/public/RTCSessionDescriptonDelegate.h b/talk/app/webrtc/objc/public/RTCSessionDescriptionDelegate.h
similarity index 91%
rename from talk/app/webrtc/objc/public/RTCSessionDescriptonDelegate.h
rename to talk/app/webrtc/objc/public/RTCSessionDescriptionDelegate.h
index 409aaee..ecdc581 100644
--- a/talk/app/webrtc/objc/public/RTCSessionDescriptonDelegate.h
+++ b/talk/app/webrtc/objc/public/RTCSessionDescriptionDelegate.h
@@ -33,9 +33,9 @@
extern NSString* const kRTCSessionDescriptionDelegateErrorDomain;
extern int const kRTCSessionDescriptionDelegateErrorCode;
-// RTCSessionDescriptonDelegate is a protocol for listening to callback messages
-// when RTCSessionDescriptions are created or set.
-@protocol RTCSessionDescriptonDelegate<NSObject>
+// RTCSessionDescriptionDelegate is a protocol for listening to callback
+// messages when RTCSessionDescriptions are created or set.
+@protocol RTCSessionDescriptionDelegate<NSObject>
// Called when creating a session.
- (void)peerConnection:(RTCPeerConnection *)peerConnection
diff --git a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h
index 18d7902..8631f01 100644
--- a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h
+++ b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h
@@ -27,14 +27,14 @@
#import <Foundation/Foundation.h>
-#import "RTCSessionDescriptonDelegate.h"
+#import "RTCSessionDescriptionDelegate.h"
@class RTCSessionDescription;
// Observer of SDP-related events, used by RTCPeerConnectionTest to check
// expectations.
@interface RTCSessionDescriptionSyncObserver : NSObject<
- RTCSessionDescriptonDelegate>
+ RTCSessionDescriptionDelegate>
// Error string. May be nil.
@property(atomic, copy) NSString *error;
diff --git a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m
index 75a4671..6d78253 100644
--- a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m
+++ b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m
@@ -71,7 +71,7 @@
[self.condition unlock];
}
-#pragma mark - RTCSessionDescriptonDelegate methods
+#pragma mark - RTCSessionDescriptionDelegate methods
- (void)peerConnection:(RTCPeerConnection*)peerConnection
didCreateSessionDescription:(RTCSessionDescription*)sdp
error:(NSError*)error {
diff --git a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.h b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.h
index 3e6d600..dd810f7 100644
--- a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.h
+++ b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.h
@@ -29,7 +29,7 @@
#import "GAEChannelClient.h"
#import "APPRTCAppClient.h"
-#import "RTCSessionDescriptonDelegate.h"
+#import "RTCSessionDescriptionDelegate.h"
#import "RTCVideoSource.h"
// Used to send a message to an apprtc.appspot.com "room".
@protocol APPRTCSendMessage<NSObject>
@@ -48,7 +48,7 @@
@interface APPRTCAppDelegate : UIResponder<ICEServerDelegate,
GAEMessageHandler,
APPRTCSendMessage,
- RTCSessionDescriptonDelegate,
+ RTCSessionDescriptionDelegate,
UIApplicationDelegate>
@property(strong, nonatomic) UIWindow* window;
diff --git a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m
index e251816..e6add76 100644
--- a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m
+++ b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m
@@ -357,7 +357,7 @@
[self closeVideoUI];
}
-#pragma mark - RTCSessionDescriptonDelegate methods
+#pragma mark - RTCSessionDescriptionDelegate methods
// Match |pattern| to |string| and return the first group of the first
// match, or nil if no match was found.
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index d61ac15..3c64ded 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -215,7 +215,7 @@
'app/webrtc/objc/public/RTCPeerConnectionDelegate.h',
'app/webrtc/objc/public/RTCPeerConnectionFactory.h',
'app/webrtc/objc/public/RTCSessionDescription.h',
- 'app/webrtc/objc/public/RTCSessionDescriptonDelegate.h',
+ 'app/webrtc/objc/public/RTCSessionDescriptionDelegate.h',
'app/webrtc/objc/public/RTCTypes.h',
'app/webrtc/objc/public/RTCVideoCapturer.h',
'app/webrtc/objc/public/RTCVideoRenderer.h',
