summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/session_restore.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/session_restore.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/session_restore.cc')
-rw-r--r--chrome/browser/sessions/session_restore.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 0931ae0..fefce53 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -252,10 +252,10 @@ void TabLoader::Observe(int type,
TabContents* tab_contents = content::Source<TabContents>(source).ptr();
if (!got_first_paint_) {
RenderWidgetHost* render_widget_host =
- GetRenderWidgetHost(&tab_contents->controller());
+ GetRenderWidgetHost(&tab_contents->GetController());
render_widget_hosts_loading_.erase(render_widget_host);
}
- HandleTabClosedOrLoaded(&tab_contents->controller());
+ HandleTabClosedOrLoaded(&tab_contents->GetController());
break;
}
case content::NOTIFICATION_LOAD_STOP: {
@@ -468,7 +468,7 @@ class SessionRestoreImpl : public content::NotificationObserver {
RestoreTabsToBrowser(*(*i), browser, selected_tab_index);
ShowBrowser(browser, initial_tab_count, selected_tab_index);
tab_loader_->TabIsLoading(
- &browser->GetSelectedTabContents()->controller());
+ &browser->GetSelectedTabContents()->GetController());
NotifySessionServiceOfRestoredTabs(browser, initial_tab_count);
}
@@ -661,7 +661,7 @@ class SessionRestoreImpl : public content::NotificationObserver {
active_tab = NULL;
}
tab_loader_->TabIsLoading(
- &browser->GetSelectedTabContents()->controller());
+ &browser->GetSelectedTabContents()->GetController());
NotifySessionServiceOfRestoredTabs(browser, initial_tab_count);
}
@@ -730,7 +730,7 @@ class SessionRestoreImpl : public content::NotificationObserver {
true,
NULL);
if (schedule_load)
- tab_loader_->ScheduleLoad(&tab_contents->controller());
+ tab_loader_->ScheduleLoad(&tab_contents->GetController());
}
Browser* CreateRestoredBrowser(Browser::Type type,