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

Unified Diff: ios/web/shell/view_controller.mm

Issue 2073753003: Convert ios_web_shell to ARC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@buildconfig-gn
Patch Set: rebase Created 4 years, 6 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 | « ios/web/shell/view_controller.h ('k') | ios/web/shell/web_exe_main.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/shell/view_controller.mm
diff --git a/ios/web/shell/view_controller.mm b/ios/web/shell/view_controller.mm
index a03c23b29ef19e5104adf16d5c551c36f09197fa..a3eca6c6581dce8f24dd00a4ca80989699e782c6 100644
--- a/ios/web/shell/view_controller.mm
+++ b/ios/web/shell/view_controller.mm
@@ -11,7 +11,6 @@
#include <memory>
#include <utility>
-#include "base/mac/objc_property_releaser.h"
#import "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "ios/net/cookies/cookie_store_ios.h"
@@ -27,6 +26,10 @@
#import "net/base/mac/url_conversions.h"
#include "ui/base/page_transition_types.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
NSString* const kWebShellBackButtonAccessibilityLabel = @"Back";
NSString* const kWebShellForwardButtonAccessibilityLabel = @"Forward";
NSString* const kWebShellAddressFieldAccessibilityLabel = @"Address field";
@@ -40,11 +43,9 @@ using web::NavigationManager;
std::unique_ptr<web::WebState> _webState;
std::unique_ptr<web::WebStateObserverBridge> _webStateObserver;
std::unique_ptr<web::WebStateDelegateBridge> _webStateDelegate;
-
- base::mac::ObjCPropertyReleaser _propertyReleaser_ViewController;
}
@property(nonatomic, assign, readonly) NavigationManager* navigationManager;
-@property(nonatomic, readwrite, retain) UITextField* field;
+@property(nonatomic, readwrite, strong) UITextField* field;
@end
@implementation ViewController
@@ -56,7 +57,6 @@ using web::NavigationManager;
- (instancetype)initWithBrowserState:(web::BrowserState*)browserState {
self = [super initWithNibName:@"MainView" bundle:nil];
if (self) {
- _propertyReleaser_ViewController.Init(self, [ViewController class]);
_browserState = browserState;
}
return self;
@@ -65,7 +65,6 @@ using web::NavigationManager;
- (void)dealloc {
net::HTTPProtocolHandlerDelegate::SetInstance(nullptr);
net::RequestTracker::SetRequestTrackerFactory(nullptr);
- [super dealloc];
}
- (void)viewDidLoad {
« no previous file with comments | « ios/web/shell/view_controller.h ('k') | ios/web/shell/web_exe_main.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698