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

Unified Diff: ios/web/navigation/crw_session_entry.mm

Issue 2202623002: Converts parts of ios/web to ARC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed extra release Created 4 years, 4 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
Index: ios/web/navigation/crw_session_entry.mm
diff --git a/ios/web/navigation/crw_session_entry.mm b/ios/web/navigation/crw_session_entry.mm
index ae293f6f488b14ee67d42200378675f048b1e117..ed27327f19f3d11ab2bb1f30bedf0b0e4eca482d 100644
--- a/ios/web/navigation/crw_session_entry.mm
+++ b/ios/web/navigation/crw_session_entry.mm
@@ -8,7 +8,6 @@
#include <memory>
-#include "base/mac/objc_property_releaser.h"
#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "ios/web/navigation/navigation_item_impl.h"
@@ -17,6 +16,10 @@
#include "ios/web/public/web_state/page_display_state.h"
#import "net/base/mac/url_conversions.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace web {
// Keys used to serialize web::PageScrollState properties.
NSString* const kSessionEntryPageScrollStateKey = @"state";
@@ -50,8 +53,6 @@ NSString* const kSessionEntryUseDesktopUserAgentKey = @"useDesktopUserAgent";
// The NavigationItemImpl corresponding to this CRWSessionEntry.
// TODO(stuartmorgan): Move ownership to NavigationManagerImpl.
std::unique_ptr<web::NavigationItemImpl> _navigationItem;
-
- base::mac::ObjCPropertyReleaser _propertyReleaser_CRWSessionEntry;
}
// Redefine originalUrl to be read-write.
@property(nonatomic, readwrite) const GURL& originalUrl;
@@ -75,7 +76,6 @@ NSString* const kSessionEntryUseDesktopUserAgentKey = @"useDesktopUserAgent";
(std::unique_ptr<web::NavigationItem>)item {
self = [super init];
if (self) {
- _propertyReleaser_CRWSessionEntry.Init(self, [CRWSessionEntry class]);
_navigationItem.reset(
static_cast<web::NavigationItemImpl*>(item.release()));
self.originalUrl = _navigationItem->GetURL();
@@ -86,7 +86,6 @@ NSString* const kSessionEntryUseDesktopUserAgentKey = @"useDesktopUserAgent";
- (instancetype)initWithCoder:(NSCoder*)aDecoder {
self = [super init];
if (self) {
- _propertyReleaser_CRWSessionEntry.Init(self, [CRWSessionEntry class]);
_navigationItem.reset(new web::NavigationItemImpl());
// Desktop chrome only persists virtualUrl_ and uses it to feed the url
@@ -175,7 +174,6 @@ NSString* const kSessionEntryUseDesktopUserAgentKey = @"useDesktopUserAgent";
- (instancetype)copyWithZone:(NSZone*)zone {
CRWSessionEntry* copy = [[[self class] alloc] init];
- copy->_propertyReleaser_CRWSessionEntry.Init(copy, [CRWSessionEntry class]);
copy->_navigationItem.reset(
new web::NavigationItemImpl(*_navigationItem.get()));
copy->_originalUrl = _originalUrl;

Powered by Google App Engine
This is Rietveld 408576698