| Index: chrome/browser/ui/browser_tabrestore.cc
|
| diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc
|
| index 373de5c8f41d8410199c0a566801a46bc34a39a2..72366211ff48168e984600a4f231e8b6e26b5127 100644
|
| --- a/chrome/browser/ui/browser_tabrestore.cc
|
| +++ b/chrome/browser/ui/browser_tabrestore.cc
|
| @@ -18,6 +18,7 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_contents_view.h"
|
|
|
| +using components::SerializedNavigationEntry;
|
| using content::WebContents;
|
| using content::NavigationController;
|
| using content::NavigationEntry;
|
| @@ -37,7 +38,7 @@ NavigationController::RestoreType GetRestoreType(Browser* browser,
|
|
|
| WebContents* CreateRestoredTab(
|
| Browser* browser,
|
| - const std::vector<TabNavigation>& navigations,
|
| + const std::vector<SerializedNavigationEntry>& navigations,
|
| int selected_navigation,
|
| const std::string& extension_app_id,
|
| bool from_last_session,
|
| @@ -67,7 +68,7 @@ WebContents* CreateRestoredTab(
|
| extensions::TabHelper::FromWebContents(web_contents)->
|
| SetExtensionAppById(extension_app_id);
|
| std::vector<NavigationEntry*> entries =
|
| - TabNavigation::CreateNavigationEntriesFromTabNavigations(
|
| + SerializedNavigationEntry::ToNavigationEntries(
|
| navigations, browser->profile());
|
| web_contents->SetUserAgentOverride(user_agent_override);
|
| web_contents->GetController().Restore(
|
| @@ -82,7 +83,7 @@ WebContents* CreateRestoredTab(
|
|
|
| content::WebContents* AddRestoredTab(
|
| Browser* browser,
|
| - const std::vector<TabNavigation>& navigations,
|
| + const std::vector<SerializedNavigationEntry>& navigations,
|
| int tab_index,
|
| int selected_navigation,
|
| const std::string& extension_app_id,
|
| @@ -131,7 +132,7 @@ content::WebContents* AddRestoredTab(
|
|
|
| void ReplaceRestoredTab(
|
| Browser* browser,
|
| - const std::vector<TabNavigation>& navigations,
|
| + const std::vector<SerializedNavigationEntry>& navigations,
|
| int selected_navigation,
|
| bool from_last_session,
|
| const std::string& extension_app_id,
|
|
|