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

Unified Diff: chrome/browser/ui/browser_tabrestore.cc

Issue 14497003: Moves TabNavigation into components/sessions and renames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really remove webkit_support Created 7 years, 8 months 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
« no previous file with comments | « chrome/browser/ui/browser_tabrestore.h ('k') | chrome/browser/ui/cocoa/history_menu_bridge.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..9bb737a4d97ea4e407d2d7c44a843ea1ec5aa9d9 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<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,
« no previous file with comments | « chrome/browser/ui/browser_tabrestore.h ('k') | chrome/browser/ui/cocoa/history_menu_bridge.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698