Chromium Code Reviews| Index: ios/web_view/shell/shell_app_delegate.mm |
| diff --git a/ios/web_view/shell/shell_app_delegate.mm b/ios/web_view/shell/shell_app_delegate.mm |
| index 61da172ca16ea82aad62e24e8e2fd37bfa66cf85..a8b3cb9c34304825cd22d95782a1bfe417edc5b3 100644 |
| --- a/ios/web_view/shell/shell_app_delegate.mm |
| +++ b/ios/web_view/shell/shell_app_delegate.mm |
| @@ -4,32 +4,35 @@ |
| #import "ios/web_view/shell/shell_app_delegate.h" |
| -#import "base/mac/scoped_nsobject.h" |
| #import "ios/web_view/public/criwv.h" |
| #import "ios/web_view/shell/shell_delegate.h" |
| #import "ios/web_view/shell/shell_view_controller.h" |
| -@interface ShellAppDelegate () { |
| - base::scoped_nsobject<ShellDelegate> _delegate; |
| -} |
| +#if !defined(__has_feature) || !__has_feature(objc_arc) |
| +#error "This file requires ARC support." |
| +#endif |
| + |
| +@interface ShellAppDelegate () |
| +@property (nonatomic, strong) ShellDelegate* delegate; |
| @end |
| @implementation ShellAppDelegate |
| +@synthesize delegate = _delegate; |
| @synthesize window = _window; |
| - (BOOL)application:(UIApplication*)application |
| didFinishLaunchingWithOptions:(NSDictionary*)launchOptions { |
| - _window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; |
| + self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; |
| self.window.backgroundColor = [UIColor whiteColor]; |
| - _delegate.reset([[ShellDelegate alloc] init]); |
| + self.delegate = [[ShellDelegate alloc] init]; |
| [CRIWV configureWithDelegate:_delegate]; |
| [self.window makeKeyAndVisible]; |
| - base::scoped_nsobject<ShellViewController> controller( |
| - [[ShellViewController alloc] init]); |
| + ShellViewController* controller = |
| + [[ShellViewController alloc] init]; |
|
Eugene But (OOO till 7-30)
2017/01/30 17:53:38
Do we still need this linebreak?
michaeldo
2017/01/30 19:30:35
Nope, fixed.
|
| self.window.rootViewController = controller; |
| return YES; |
| @@ -51,9 +54,4 @@ |
| [CRIWV shutDown]; |
| } |
| -- (void)dealloc { |
| - [_window release]; |
| - [super dealloc]; |
| -} |
| - |
| @end |