AppRTCDemo(ios): style/cleanup fixes following cr/62871616-p10
BUG=2168
R=noahric@google.com
Review URL: https://webrtc-codereview.appspot.com/9709004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5768 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/examples/ios/AppRTCDemo/GAEChannelClient.m b/talk/examples/ios/AppRTCDemo/GAEChannelClient.m
index e0d9a80..1b5e559 100644
--- a/talk/examples/ios/AppRTCDemo/GAEChannelClient.m
+++ b/talk/examples/ios/AppRTCDemo/GAEChannelClient.m
@@ -32,27 +32,23 @@
@interface GAEChannelClient ()
@property(nonatomic, assign) id<GAEMessageHandler> delegate;
-@property(nonatomic, strong) UIWebView *webView;
+@property(nonatomic, strong) UIWebView* webView;
@end
@implementation GAEChannelClient
-@synthesize delegate = _delegate;
-@synthesize webView = _webView;
-
-- (id)initWithToken:(NSString *)token delegate:(id<GAEMessageHandler>)delegate {
+- (id)initWithToken:(NSString*)token delegate:(id<GAEMessageHandler>)delegate {
self = [super init];
if (self) {
_webView = [[UIWebView alloc] init];
_webView.delegate = self;
_delegate = delegate;
- NSString *htmlPath =
+ NSString* htmlPath =
[[NSBundle mainBundle] pathForResource:@"ios_channel" ofType:@"html"];
- NSURL *htmlUrl = [NSURL fileURLWithPath:htmlPath];
- NSString *path = [NSString stringWithFormat:@"%@?token=%@",
- [htmlUrl absoluteString],
- token];
+ NSURL* htmlUrl = [NSURL fileURLWithPath:htmlPath];
+ NSString* path = [NSString
+ stringWithFormat:@"%@?token=%@", [htmlUrl absoluteString], token];
[_webView
loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:path]]];
@@ -67,17 +63,17 @@
#pragma mark - UIWebViewDelegate method
-- (BOOL)webView:(UIWebView *)webView
- shouldStartLoadWithRequest:(NSURLRequest *)request
+- (BOOL)webView:(UIWebView*)webView
+ shouldStartLoadWithRequest:(NSURLRequest*)request
navigationType:(UIWebViewNavigationType)navigationType {
- NSString *scheme = [request.URL scheme];
+ NSString* scheme = [request.URL scheme];
if ([scheme compare:@"js-frame"] != NSOrderedSame) {
return YES;
}
- NSString *resourceSpecifier = [request.URL resourceSpecifier];
+ NSString* resourceSpecifier = [request.URL resourceSpecifier];
NSRange range = [resourceSpecifier rangeOfString:@":"];
- NSString *method;
- NSString *message;
+ NSString* method;
+ NSString* message;
if (range.length == 0 && range.location == NSNotFound) {
method = resourceSpecifier;
} else {
@@ -85,21 +81,21 @@
message = [resourceSpecifier substringFromIndex:range.location + 1];
}
dispatch_async(dispatch_get_main_queue(), ^(void) {
- if ([method compare:@"onopen"] == NSOrderedSame) {
- [self.delegate onOpen];
- } else if ([method compare:@"onmessage"] == NSOrderedSame) {
- [self.delegate onMessage:message];
- } else if ([method compare:@"onclose"] == NSOrderedSame) {
- [self.delegate onClose];
- } else if ([method compare:@"onerror"] == NSOrderedSame) {
- // TODO(hughv): Get error.
- int code = -1;
- NSString *description = message;
- [self.delegate onError:code withDescription:description];
- } else {
- NSAssert(NO, @"Invalid message sent from UIWebView: %@",
- resourceSpecifier);
- }
+ if ([method compare:@"onopen"] == NSOrderedSame) {
+ [self.delegate onOpen];
+ } else if ([method compare:@"onmessage"] == NSOrderedSame) {
+ [self.delegate onMessage:message];
+ } else if ([method compare:@"onclose"] == NSOrderedSame) {
+ [self.delegate onClose];
+ } else if ([method compare:@"onerror"] == NSOrderedSame) {
+ // TODO(hughv): Get error.
+ int code = -1;
+ NSString* description = message;
+ [self.delegate onError:code withDescription:description];
+ } else {
+ NSAssert(
+ NO, @"Invalid message sent from UIWebView: %@", resourceSpecifier);
+ }
});
return YES;
}