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

Unified Diff: content/public/browser/navigation_controller.h

Issue 1851933002: Convert //url to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixup 7 Created 4 years, 9 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 | « content/child/webblobregistry_impl.cc ('k') | content/renderer/manifest/manifest_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/navigation_controller.h
diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h
index 9e6cb60cc7121b89f7954d761d24624cb84ff546..6e6c2e410c74868eaab6bce32e487290f1678c2f 100644
--- a/content/public/browser/navigation_controller.h
+++ b/content/public/browser/navigation_controller.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <string>
#include <vector>
@@ -110,7 +111,7 @@ class NavigationController {
// Creates a navigation entry and translates the virtual url to a real one.
// This is a general call; prefer LoadURL[FromRenderer]/TransferURL below.
// Extra headers are separated by \n.
- CONTENT_EXPORT static scoped_ptr<NavigationEntry> CreateNavigationEntry(
+ CONTENT_EXPORT static std::unique_ptr<NavigationEntry> CreateNavigationEntry(
const GURL& url,
const Referrer& referrer,
ui::PageTransition transition,
@@ -239,9 +240,10 @@ class NavigationController {
// indicates where the restor comes from. This takes ownership of the
// NavigationEntrys in |entries| and clears it out. This is used for session
// restore.
- virtual void Restore(int selected_navigation,
- RestoreType type,
- std::vector<scoped_ptr<NavigationEntry>>* entries) = 0;
+ virtual void Restore(
+ int selected_navigation,
+ RestoreType type,
+ std::vector<std::unique_ptr<NavigationEntry>>* entries) = 0;
// Entries -------------------------------------------------------------------
@@ -330,7 +332,7 @@ class NavigationController {
// represented as an entry, but should go away when the user navigates away
// from them.
// Note that adding a transient entry does not change the active contents.
- virtual void SetTransientEntry(scoped_ptr<NavigationEntry> entry) = 0;
+ virtual void SetTransientEntry(std::unique_ptr<NavigationEntry> entry) = 0;
// New navigations -----------------------------------------------------------
« no previous file with comments | « content/child/webblobregistry_impl.cc ('k') | content/renderer/manifest/manifest_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698