diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-29 00:23:55 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-29 00:23:55 +0000 |
commit | a26023822aec02831957e541b61a6bdb3fac694e (patch) | |
tree | 2fa3d0368ddc4f75d6372721c6b07d8e2d7c37af /chrome/browser/sessions | |
parent | 716476cf40c8d367b1325c5a46f4e5e886965c28 (diff) | |
download | chromium_src-a26023822aec02831957e541b61a6bdb3fac694e.zip chromium_src-a26023822aec02831957e541b61a6bdb3fac694e.tar.gz chromium_src-a26023822aec02831957e541b61a6bdb3fac694e.tar.bz2 |
Convert unix_hacker functions on NavigationController that are used by Chrome to CamelCase. This is in preparation for adding an interface around NavigationController.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8989070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
-rw-r--r-- | chrome/browser/sessions/session_service.cc | 6 | ||||
-rw-r--r-- | chrome/browser/sessions/tab_restore_service.cc | 6 | ||||
-rw-r--r-- | chrome/browser/sessions/tab_restore_service_browsertest.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index ff7cf00..e7e28c9 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -562,7 +562,7 @@ void SessionService::Observe(int type, TabNavigationPathPrunedFromBack( tab->restore_tab_helper()->window_id(), tab->restore_tab_helper()->session_id(), - tab->tab_contents()->GetController().entry_count()); + tab->tab_contents()->GetController().GetEntryCount()); } RecordSessionUpdateHistogramData(content::NOTIFICATION_NAV_LIST_PRUNED, &last_updated_nav_list_pruned_time_); @@ -1121,9 +1121,9 @@ void SessionService::BuildCommandsForTab( current_index - max_persist_navigation_count); const int max_index = std::min(current_index + max_persist_navigation_count, - tab->tab_contents()->GetController().entry_count()); + tab->tab_contents()->GetController().GetEntryCount()); const int pending_index = - tab->tab_contents()->GetController().pending_entry_index(); + tab->tab_contents()->GetController().GetPendingEntryIndex(); if (tab_to_available_range) { (*tab_to_available_range)[session_id.id()] = std::pair<int, int>(min_index, max_index); diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc index 1fed2156..f4c651b 100644 --- a/chrome/browser/sessions/tab_restore_service.cc +++ b/chrome/browser/sessions/tab_restore_service.cc @@ -486,8 +486,8 @@ void TabRestoreService::PopulateTab(Tab* tab, int index, TabRestoreServiceDelegate* delegate, NavigationController* controller) { - const int pending_index = controller->pending_entry_index(); - int entry_count = controller->entry_count(); + const int pending_index = controller->GetPendingEntryIndex(); + int entry_count = controller->GetEntryCount(); if (entry_count == 0 && pending_index == 0) entry_count++; tab->navigations.resize(static_cast<int>(entry_count)); @@ -513,7 +513,7 @@ void TabRestoreService::PopulateTab(Tab* tab, tab->extension_app_id = extension->id(); } - tab->session_storage_namespace = controller->session_storage_namespace(); + tab->session_storage_namespace = controller->GetSessionStorageNamespace(); // Delegate may be NULL during unit tests. if (delegate) { diff --git a/chrome/browser/sessions/tab_restore_service_browsertest.cc b/chrome/browser/sessions/tab_restore_service_browsertest.cc index d664597..0022a2e 100644 --- a/chrome/browser/sessions/tab_restore_service_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_service_browsertest.cc @@ -190,7 +190,7 @@ TEST_F(TabRestoreServiceTest, DontRestorePrintPreviewTab) { GURL printPreviewURL(chrome::kChromeUIPrintURL); NavigateAndCommit(printPreviewURL); EXPECT_EQ(printPreviewURL, contents()->GetURL()); - EXPECT_EQ(4, controller().entry_count()); + EXPECT_EQ(4, controller().GetEntryCount()); // Have the service record the tab. service_->CreateHistoricalTab(&controller(), -1); |