From 40a7e41b4820be63de44ece14c70b3bfe7e4c564 Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Mon, 29 Apr 2013 18:13:01 +0000 Subject: Moves TabNavigation into components/sessions and renames SerializedNaviationEntry. FreezeDriedNavigationEntry is probably an even better name, but I couldn't bring myself to such a long and wordy class name. Additionally did the following changes to make it easier to move: . exposed a bunch of getters on SerializedNavigationEntry so that you don't need to go through SerializedNavigationTestHelper. . Make WriteToPickle take the max size. This way the code doesn't have a dependency on SessionID. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/14497003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197086 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/browser_tabrestore.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chrome/browser/ui/browser_tabrestore.cc') diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc index 373de5c..9bb737a 100644 --- a/chrome/browser/ui/browser_tabrestore.cc +++ b/chrome/browser/ui/browser_tabrestore.cc @@ -21,6 +21,7 @@ using content::WebContents; using content::NavigationController; using content::NavigationEntry; +using sessions::SerializedNavigationEntry; namespace chrome { @@ -37,7 +38,7 @@ NavigationController::RestoreType GetRestoreType(Browser* browser, WebContents* CreateRestoredTab( Browser* browser, - const std::vector& navigations, + const std::vector& 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 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& navigations, + const std::vector& 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& navigations, + const std::vector& navigations, int selected_navigation, bool from_last_session, const std::string& extension_app_id, -- cgit v1.1