summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/tab_restore_service.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 03:25:11 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 03:25:11 +0000
commit7f0005ab19ca4e374029180753c32e4c9813303a (patch)
treef36e756a90ff4324530789c89aef6a2e2f3573b5 /chrome/browser/sessions/tab_restore_service.cc
parentb237407befc41c3a19c7519523b102808213b49b (diff)
downloadchromium_src-7f0005ab19ca4e374029180753c32e4c9813303a.zip
chromium_src-7f0005ab19ca4e374029180753c32e4c9813303a.tar.gz
chromium_src-7f0005ab19ca4e374029180753c32e4c9813303a.tar.bz2
Remove TabContentsType from the NavigationController external interface and in
some related areas. I removed all uses of this in the previous patch. Review URL: http://codereview.chromium.org/73057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/tab_restore_service.cc')
-rw-r--r--chrome/browser/sessions/tab_restore_service.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index b49e3f6..340bf34 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -310,14 +310,14 @@ void TabRestoreService::Save() {
void TabRestoreService::PopulateTabFromController(
NavigationController* controller,
Tab* tab) {
- const int pending_index = controller->GetPendingEntryIndex();
- int entry_count = controller->GetEntryCount();
+ const int pending_index = controller->pending_entry_index();
+ int entry_count = controller->entry_count();
if (entry_count == 0 && pending_index == 0)
entry_count++;
tab->navigations.resize(static_cast<int>(entry_count));
for (int i = 0; i < entry_count; ++i) {
NavigationEntry* entry = (i == pending_index) ?
- controller->GetPendingEntry() : controller->GetEntryAtIndex(i);
+ controller->pending_entry() : controller->GetEntryAtIndex(i);
tab->navigations[i].SetFromNavigationEntry(*entry);
}
tab->current_navigation_index = controller->GetCurrentEntryIndex();