components/sessions/content/content_serialized_navigation_builder.h - Issue 1440573003: Remove ScopedVector from NavigationController.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/sessions/content/content_serialized_navigation_builder.h

Issue 1440573003: Remove ScopedVector from NavigationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: aw Created 5 years, 1 month 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

« android_webview/native/state_serializer.cc ('K') | « chrome/browser/ui/passwords/manage_passwords_test.h ('k') | components/sessions/content/content_serialized_navigation_builder.cc » ('j') | components/sessions/content/content_serialized_navigation_builder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sessions/content/content_serialized_navigation_builder.h

diff --git a/components/sessions/content/content_serialized_navigation_builder.h b/components/sessions/content/content_serialized_navigation_builder.h

index bde17afacf357d8324378f02101811da71cdd937..34c8483e1725df432055ee59b7d311b8a260e6a3 100644

--- a/components/sessions/content/content_serialized_navigation_builder.h

+++ b/components/sessions/content/content_serialized_navigation_builder.h

@@ -8,7 +8,6 @@

#include <vector>

#include "base/memory/scoped_ptr.h"

-#include "base/memory/scoped_vector.h"

#include "components/sessions/core/sessions_export.h"

namespace content {

@@ -39,7 +38,7 @@ class SESSIONS_EXPORT ContentSerializedNavigationBuilder {

// Converts a set of SerializedNavigationEntrys into a list of

// NavigationEntrys with sequential page IDs and the given context.

- static ScopedVector<content::NavigationEntry> ToNavigationEntries(

+ static std::vector<scoped_ptr<content::NavigationEntry>> ToNavigationEntries(

const std::vector<SerializedNavigationEntry>& navigations,

content::BrowserContext* browser_context);

};