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

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

Issue 10917231: Revamp TabNavigation class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac Created 8 years, 3 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
Index: chrome/browser/ui/browser_tabrestore.cc
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc
index 4443305c54828e9b268dcb84dc80a6fbf8d70a3e..da35864adf6ca9da8ed732592e58a09c3f396497 100644
--- a/chrome/browser/ui/browser_tabrestore.cc
+++ b/chrome/browser/ui/browser_tabrestore.cc
@@ -59,9 +59,9 @@ content::WebContents* AddRestoredTab(
WebContents* new_tab = tab_contents->web_contents();
extensions::TabHelper::FromWebContents(new_tab)->
SetExtensionAppById(extension_app_id);
- std::vector<NavigationEntry*> entries;
- TabNavigation::CreateNavigationEntriesFromTabNavigations(
- browser->profile(), navigations, &entries);
+ std::vector<NavigationEntry*> entries =
+ TabNavigation::CreateNavigationEntriesFromTabNavigations(
+ navigations, browser->profile());
new_tab->SetUserAgentOverride(user_agent_override);
new_tab->GetController().Restore(
selected_navigation, from_last_session, &entries);
@@ -123,9 +123,9 @@ void ReplaceRestoredTab(
extensions::TabHelper::FromWebContents(replacement)->
SetExtensionAppById(extension_app_id);
replacement->SetUserAgentOverride(user_agent_override);
- std::vector<NavigationEntry*> entries;
- TabNavigation::CreateNavigationEntriesFromTabNavigations(
- browser->profile(), navigations, &entries);
+ std::vector<NavigationEntry*> entries =
+ TabNavigation::CreateNavigationEntriesFromTabNavigations(
+ navigations, browser->profile());
replacement->GetController().Restore(
selected_navigation, from_last_session, &entries);
DCHECK_EQ(0u, entries.size());
« no previous file with comments | « chrome/browser/sync/test/integration/sessions_helper.cc ('k') | chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698