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

Unified Diff: ios/web/navigation/navigation_item_impl.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/navigation_item_impl.h ('k') | ios/web/navigation/navigation_item_impl_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/navigation_item_impl.mm
diff --git a/ios/web/navigation/navigation_item_impl.mm b/ios/web/navigation/navigation_item_impl.mm
index 7d7e74841c3b802eeb86b1a508dc0c7cca966d7d..6c79202a1df556f0ff13bd1b34c5abbf59c0f35f 100644
--- a/ios/web/navigation/navigation_item_impl.mm
+++ b/ios/web/navigation/navigation_item_impl.mm
@@ -6,10 +6,10 @@
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "components/url_formatter/url_formatter.h"
#include "ui/base/page_transition_types.h"
#include "ui/gfx/text_elider.h"
@@ -28,8 +28,8 @@ static int GetUniqueIDInConstructor() {
namespace web {
// static
-scoped_ptr<NavigationItem> NavigationItem::Create() {
- return scoped_ptr<NavigationItem>(new NavigationItemImpl());
+std::unique_ptr<NavigationItem> NavigationItem::Create() {
+ return std::unique_ptr<NavigationItem>(new NavigationItemImpl());
}
NavigationItemImpl::NavigationItemImpl()
@@ -71,7 +71,7 @@ NavigationItemImpl::NavigationItemImpl(const NavigationItemImpl& item)
}
void NavigationItemImpl::SetFacadeDelegate(
- scoped_ptr<NavigationItemFacadeDelegate> facade_delegate) {
+ std::unique_ptr<NavigationItemFacadeDelegate> facade_delegate) {
facade_delegate_ = std::move(facade_delegate);
}
« no previous file with comments | « ios/web/navigation/navigation_item_impl.h ('k') | ios/web/navigation/navigation_item_impl_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698