summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/tab_restore_service.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 05:09:04 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 05:09:04 +0000
commit69cda6547de3c2bc25e6476607e7550ba548cac9 (patch)
treee54f39838f04e0e61921cd7457711019be8b545f /chrome/browser/sessions/tab_restore_service.cc
parentc691a593ac199d774a43f239342cd85c80ca1a2a (diff)
downloadchromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.zip
chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.gz
chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.bz2
Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716 TBR=dpranke Review URL: http://codereview.chromium.org/8956050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/tab_restore_service.cc')
-rw-r--r--chrome/browser/sessions/tab_restore_service.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index 3fb872a..1582c88 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -250,7 +250,7 @@ void TabRestoreService::BrowserClosing(TabRestoreServiceDelegate* delegate) {
PopulateTab(&(window->tabs[entry_index]),
tab_index,
delegate,
- &delegate->GetTabContentsAt(tab_index)->controller());
+ &delegate->GetTabContentsAt(tab_index)->GetController());
if (window->tabs[entry_index].navigations.empty()) {
window->tabs.erase(window->tabs.begin() + entry_index);
} else {
@@ -361,7 +361,7 @@ void TabRestoreService::RestoreEntryById(TabRestoreServiceDelegate* delegate,
tab.pinned, tab.from_last_session,
tab.session_storage_namespace);
if (restored_tab) {
- restored_tab->controller().LoadIfNecessary();
+ restored_tab->GetController().LoadIfNecessary();
RecordAppLaunch(profile(), tab);
}
}