diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 15:23:08 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 15:23:08 +0000 |
| commit | 4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c (patch) | |
| tree | e2f495edbb471c545155e2421495500da7ef52d4 /chrome/browser/instant/instant_controller.cc | |
| parent | 075ee36cf9db4bf2c83cb1d95baf3ffb9faeda99 (diff) | |
| download | chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.zip chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.tar.gz chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.tar.bz2 | |
Clean up TCW, make it solely a hub for 1:1 observer/helper objects.
BUG=105872
TEST=no functional change
Review URL: http://codereview.chromium.org/8892011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant/instant_controller.cc')
| -rw-r--r-- | chrome/browser/instant/instant_controller.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index b1396f6..b8f10d1 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -269,7 +269,8 @@ TabContentsWrapper* InstantController::CommitCurrentPreview( InstantCommitType type) { DCHECK(loader_.get()); TabContentsWrapper* tab = ReleasePreviewContents(type); - tab->controller().CopyStateFromAndPrune(&tab_contents_->controller()); + tab->tab_contents()->controller().CopyStateFromAndPrune( + &tab_contents_->tab_contents()->controller()); delegate_->CommitInstant(tab); CompleteRelease(tab); return tab; |