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

Unified Diff: ios/web/navigation/crw_session_controller.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
Index: ios/web/navigation/crw_session_controller.mm
diff --git a/ios/web/navigation/crw_session_controller.mm b/ios/web/navigation/crw_session_controller.mm
index ba45a324632409f161b6965e8a754ff812dea82f..afd78bfac7e92e7558926228b3e0e276dbaa3eb8 100644
--- a/ios/web/navigation/crw_session_controller.mm
+++ b/ios/web/navigation/crw_session_controller.mm
@@ -188,7 +188,7 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
scoped_items.release(&items);
for (size_t i = 0; i < items.size(); ++i) {
- scoped_ptr<web::NavigationItem> item(items[i]);
+ std::unique_ptr<web::NavigationItem> item(items[i]);
base::scoped_nsobject<CRWSessionEntry> entry(
[[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]);
[_entries addObject:entry];
@@ -873,7 +873,7 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
GURL loaded_url(url);
BOOL urlWasRewritten = NO;
if (_navigationManager) {
- scoped_ptr<std::vector<web::BrowserURLRewriter::URLRewriter>>
+ std::unique_ptr<std::vector<web::BrowserURLRewriter::URLRewriter>>
transientRewriters = _navigationManager->GetTransientURLRewriters();
if (transientRewriters) {
urlWasRewritten = web::BrowserURLRewriter::RewriteURLWithWriters(
@@ -884,7 +884,7 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
web::BrowserURLRewriter::GetInstance()->RewriteURLIfNecessary(
&loaded_url, _browserState);
}
- scoped_ptr<web::NavigationItemImpl> item(new web::NavigationItemImpl());
+ std::unique_ptr<web::NavigationItemImpl> item(new web::NavigationItemImpl());
item->SetURL(loaded_url);
item->SetReferrer(referrer);
item->SetTransitionType(transition);
« no previous file with comments | « ios/web/interstitials/native_web_interstitial_impl.mm ('k') | ios/web/navigation/crw_session_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698