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

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

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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/navigation/crw_session_entry.h ('k') | ios/web/navigation/crw_session_entry_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a4c462ebdb44f4a4dcc97fe9520d6e03ff7e2952..ae293f6f488b14ee67d42200378675f048b1e117 100644
--- a/ios/web/navigation/crw_session_entry.mm
+++ b/ios/web/navigation/crw_session_entry.mm
@@ -6,9 +6,10 @@
#include <stdint.h>
+#include <memory>
+
#include "base/mac/objc_property_releaser.h"
#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/sys_string_conversions.h"
#include "ios/web/navigation/navigation_item_impl.h"
#include "ios/web/navigation/nscoder_util.h"
@@ -48,7 +49,7 @@ NSString* const kSessionEntryUseDesktopUserAgentKey = @"useDesktopUserAgent";
// The NavigationItemImpl corresponding to this CRWSessionEntry.
// TODO(stuartmorgan): Move ownership to NavigationManagerImpl.
- scoped_ptr<web::NavigationItemImpl> _navigationItem;
+ std::unique_ptr<web::NavigationItemImpl> _navigationItem;
base::mac::ObjCPropertyReleaser _propertyReleaser_CRWSessionEntry;
}
@@ -70,7 +71,8 @@ NSString* const kSessionEntryUseDesktopUserAgentKey = @"useDesktopUserAgent";
@synthesize originalUrl = _originalUrl;
-- (instancetype)initWithNavigationItem:(scoped_ptr<web::NavigationItem>)item {
+- (instancetype)initWithNavigationItem:
+ (std::unique_ptr<web::NavigationItem>)item {
self = [super init];
if (self) {
_propertyReleaser_CRWSessionEntry.Init(self, [CRWSessionEntry class]);
« no previous file with comments | « ios/web/navigation/crw_session_entry.h ('k') | ios/web/navigation/crw_session_entry_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698