Chromium Code Reviews| Index: ios/web_view/shell/translate_controller.mm |
| diff --git a/ios/web_view/shell/translate_controller.mm b/ios/web_view/shell/translate_controller.mm |
| index 23ec4c93a658e7b9eca586f81cd794f0a0771e3b..683d6dd998cd4207df15d656f07200aaafe27662 100644 |
| --- a/ios/web_view/shell/translate_controller.mm |
| +++ b/ios/web_view/shell/translate_controller.mm |
| @@ -7,21 +7,26 @@ |
| #import <UIKit/UIKit.h> |
| #include "base/logging.h" |
| -#import "base/mac/scoped_nsobject.h" |
| #import "ios/web_view/public/criwv_translate_manager.h" |
| -@interface TranslateController () { |
| - base::scoped_nsobject<UIAlertController> _beforeTranslateActionSheet; |
| - base::scoped_nsprotocol<id<CRIWVTranslateManager>> _translateManager; |
| -} |
| +#if !defined(__has_feature) || !__has_feature(objc_arc) |
| +#error "This file requires ARC support." |
| +#endif |
| + |
| +@interface TranslateController () |
| +@property (nonatomic, strong) UIAlertController* beforeTranslateActionSheet; |
|
Eugene But (OOO till 7-30)
2017/01/30 17:53:39
Please add comments.
|
| +@property (nonatomic, strong) id<CRIWVTranslateManager> translateManager; |
| + |
| @end |
| @implementation TranslateController |
| +@synthesize beforeTranslateActionSheet = _beforeTranslateActionSheet; |
| +@synthesize translateManager = _translateManager; |
| + |
| - (void)dealloc { |
| [_beforeTranslateActionSheet dismissViewControllerAnimated:YES |
| completion:nil]; |
| - [super dealloc]; |
| } |
| #pragma mark CRIWVTranslateDelegate methods |
| @@ -31,19 +36,19 @@ |
| if (step == CRIWVTransateStepBeforeTranslate) { |
| DCHECK(!_translateManager); |
| DCHECK(!_beforeTranslateActionSheet); |
| - _translateManager.reset([manager retain]); |
| - _beforeTranslateActionSheet.reset([[UIAlertController |
| + self.translateManager = manager; |
| + self.beforeTranslateActionSheet = [UIAlertController |
| alertControllerWithTitle:nil |
| message:@"Translate?" |
| - preferredStyle:UIAlertControllerStyleActionSheet] retain]); |
| + preferredStyle:UIAlertControllerStyleActionSheet]; |
| UIAlertAction* cancelAction = |
| [UIAlertAction actionWithTitle:@"Nope." |
| style:UIAlertActionStyleCancel |
| handler:^(UIAlertAction* action) { |
| DCHECK(_beforeTranslateActionSheet); |
| - _beforeTranslateActionSheet.reset(); |
| + _beforeTranslateActionSheet = nil; |
|
Eugene But (OOO till 7-30)
2017/01/30 17:53:39
nit: self.beforeTranslateActionSheet = nil? Same f
michaeldo
2017/01/30 19:30:35
Done.
|
| DCHECK(_translateManager); |
| - _translateManager.reset(); |
| + _translateManager = nil; |
| }]; |
| [_beforeTranslateActionSheet addAction:cancelAction]; |
| @@ -52,10 +57,10 @@ |
| style:UIAlertActionStyleDefault |
| handler:^(UIAlertAction* action) { |
| DCHECK(_beforeTranslateActionSheet); |
| - _beforeTranslateActionSheet.reset(); |
| + _beforeTranslateActionSheet = nil; |
| DCHECK(_translateManager); |
| [_translateManager translate]; |
| - _translateManager.reset(); |
| + _translateManager = nil; |
| }]; |
| [_beforeTranslateActionSheet addAction:translateAction]; |