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

Unified Diff: chrome/browser/android/tab_state.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: chrome/browser/android/tab_state.cc
diff --git a/chrome/browser/android/tab_state.cc b/chrome/browser/android/tab_state.cc
index 4cfb6e39fc9358fe67541e85d400a70fa2901ddd..327bc8c4500e69533cccd3e80cac36fd1f23e90d 100644
--- a/chrome/browser/android/tab_state.cc
+++ b/chrome/browser/android/tab_state.cc
@@ -426,7 +426,7 @@ WebContents* WebContentsState::RestoreContentsFromByteBuffer(
return NULL;
Profile* profile = ProfileManager::GetActiveUserProfile();
- ScopedVector<content::NavigationEntry> scoped_entries =
+ std::vector<scoped_ptr<content::NavigationEntry>> entries =
sessions::ContentSerializedNavigationBuilder::ToNavigationEntries(
navigations, profile);
@@ -436,9 +436,8 @@ WebContents* WebContentsState::RestoreContentsFromByteBuffer(
params.initially_hidden = initially_hidden;
scoped_ptr<WebContents> web_contents(WebContents::Create(params));
web_contents->GetController().Restore(
- current_entry_index,
- NavigationController::RESTORE_CURRENT_SESSION,
- &scoped_entries);
+ current_entry_index, NavigationController::RESTORE_CURRENT_SESSION,
+ &entries);
return web_contents.release();
}

Powered by Google App Engine
This is Rietveld 408576698