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

Unified Diff: ios/web/navigation/navigation_manager_impl.h

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_unittest.mm ('k') | ios/web/navigation/navigation_manager_impl.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/navigation_manager_impl.h
diff --git a/ios/web/navigation/navigation_manager_impl.h b/ios/web/navigation/navigation_manager_impl.h
index f8d870979c63875ae3f3bb349c8cc10438cd368d..72eb2dc5ce539272212c0f7de6730c2277603d24 100644
--- a/ios/web/navigation/navigation_manager_impl.h
+++ b/ios/web/navigation/navigation_manager_impl.h
@@ -7,11 +7,11 @@
#include <stddef.h>
+#include <memory>
#include <vector>
#include "base/mac/scoped_nsobject.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#import "ios/web/public/navigation_manager.h"
#include "ui/base/page_transition_types.h"
@@ -120,7 +120,7 @@ class NavigationManagerImpl : public NavigationManager {
// the caller.
// TODO(crbug.com/546197): remove once NavigationItem creation occurs in this
// class.
- scoped_ptr<std::vector<BrowserURLRewriter::URLRewriter>>
+ std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>>
GetTransientURLRewriters();
// Called to reset the transient url rewriter list.
@@ -145,7 +145,7 @@ class NavigationManagerImpl : public NavigationManager {
NavigationManagerFacadeDelegate* facade_delegate_;
// List of transient url rewriters added by |AddTransientURLRewriter()|.
- scoped_ptr<std::vector<BrowserURLRewriter::URLRewriter>>
+ std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>>
transient_url_rewriters_;
DISALLOW_COPY_AND_ASSIGN(NavigationManagerImpl);
« no previous file with comments | « ios/web/navigation/navigation_item_impl_unittest.mm ('k') | ios/web/navigation/navigation_manager_impl.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698