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

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

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
Index: components/sessions/content/content_serialized_navigation_builder.cc
diff --git a/components/sessions/content/content_serialized_navigation_builder.cc b/components/sessions/content/content_serialized_navigation_builder.cc
index d371994423f90f8b1ee3914acbf10ee4d1db4931..e98c2df6e8eff79af747cf14e1be9cff364174fe 100644
--- a/components/sessions/content/content_serialized_navigation_builder.cc
+++ b/components/sessions/content/content_serialized_navigation_builder.cc
@@ -85,19 +85,17 @@ ContentSerializedNavigationBuilder::ToNavigationEntry(
}
// static
-ScopedVector<content::NavigationEntry>
+std::vector<scoped_ptr<content::NavigationEntry>>
ContentSerializedNavigationBuilder::ToNavigationEntries(
const std::vector<SerializedNavigationEntry>& navigations,
content::BrowserContext* browser_context) {
int page_id = 0;
- ScopedVector<content::NavigationEntry> entries;
- for (std::vector<SerializedNavigationEntry>::const_iterator
- it = navigations.begin(); it != navigations.end(); ++it) {
- entries.push_back(
- ToNavigationEntry(&(*it), page_id, browser_context).release());
+ std::vector<scoped_ptr<content::NavigationEntry>> entries;
ncarter (slow) 2015/11/12 18:10:40 Might as well: entries.reserve(navigations.size()
Avi (use Gerrit) 2015/11/12 19:13:04 Done.
+ for (const auto& navigation : navigations) {
+ entries.push_back(ToNavigationEntry(&navigation, page_id, browser_context));
++page_id;
}
- return entries.Pass();
+ return entries;
}
} // namespace sessions

Powered by Google App Engine
This is Rietveld 408576698