chrome/browser/instant/instant_controller.cc - Issue 8892011: Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/instant/instant_controller.cc

Issue 8892011: Clean up TCW, make it solely a hub for 1:1 observer/helper objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/instant/instant_controller.cc

diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc

index b1396f6ed5e9742abacdb5cb8ac62a6c24840e05..b8f10d1784b899335a91db8f248f91d8f05483cc 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;