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

Unified Diff: chrome/browser/ui/browser_tabrestore.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/ui/browser_tabrestore.cc
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc
index 5943f3871b8a2977dfdf9ef64ecd67fb5b778fb8..ba24ec0c1027d0aaab8351a55954f57758c598d5 100644
--- a/chrome/browser/ui/browser_tabrestore.cc
+++ b/chrome/browser/ui/browser_tabrestore.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/browser_tabrestore.h"
-#include "base/memory/scoped_vector.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_service.h"
@@ -72,14 +71,14 @@ WebContents* CreateRestoredTab(
extensions::TabHelper::CreateForWebContents(web_contents);
extensions::TabHelper::FromWebContents(web_contents)->
SetExtensionAppById(extension_app_id);
- ScopedVector<NavigationEntry> scoped_entries =
+ std::vector<scoped_ptr<NavigationEntry>> entries =
ContentSerializedNavigationBuilder::ToNavigationEntries(
navigations, browser->profile());
web_contents->SetUserAgentOverride(user_agent_override);
web_contents->GetController().Restore(
selected_navigation, GetRestoreType(browser, from_last_session),
- &scoped_entries);
- DCHECK_EQ(0u, scoped_entries.size());
+ &entries);
+ DCHECK_EQ(0u, entries.size());
return web_contents;
}

Powered by Google App Engine
This is Rietveld 408576698