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

Unified Diff: chrome/browser/sessions/session_restore_android.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/sessions/session_restore_android.cc
diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
index 5bce046309e76603c5256b24bae3b61211c4d807..ea2fec63b94fc5504ed39b68a18597969c0f14a3 100644
--- a/chrome/browser/sessions/session_restore_android.cc
+++ b/chrome/browser/sessions/session_restore_android.cc
@@ -6,7 +6,6 @@
#include <vector>
-#include "base/memory/scoped_vector.h"
#include "chrome/browser/android/tab_android.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/android/tab_model/tab_model.h"
@@ -31,7 +30,7 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
Profile* profile = Profile::FromBrowserContext(context);
TabModel* tab_model = TabModelList::GetTabModelForWebContents(web_contents);
DCHECK(tab_model);
- ScopedVector<content::NavigationEntry> scoped_entries =
+ std::vector<scoped_ptr<content::NavigationEntry>> entries =
sessions::ContentSerializedNavigationBuilder::ToNavigationEntries(
session_tab.navigations, profile);
content::WebContents* new_web_contents = content::WebContents::Create(
@@ -40,7 +39,7 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
new_web_contents->GetController().Restore(
selected_index,
content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
- &scoped_entries);
+ &entries);
TabAndroid* current_tab = TabAndroid::FromWebContents(web_contents);
DCHECK(current_tab);

Powered by Google App Engine
This is Rietveld 408576698