summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant/instant_controller.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/instant/instant_controller.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/instant/instant_controller.cc')
-rw-r--r--chrome/browser/instant/instant_controller.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index b8f10d1..74a0d72 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -269,8 +269,8 @@ TabContentsWrapper* InstantController::CommitCurrentPreview(
InstantCommitType type) {
DCHECK(loader_.get());
TabContentsWrapper* tab = ReleasePreviewContents(type);
- tab->tab_contents()->controller().CopyStateFromAndPrune(
- &tab_contents_->tab_contents()->controller());
+ tab->tab_contents()->GetController().CopyStateFromAndPrune(
+ &tab_contents_->tab_contents()->GetController());
delegate_->CommitInstant(tab);
CompleteRelease(tab);
return tab;