diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 16:52:35 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 16:52:35 +0000 |
| commit | 8f60e8e23491fd101deecfb6482fdd992a1e7dca (patch) | |
| tree | 14909dac1de0784937caf703fac3b247e5092c00 /chrome/browser/instant | |
| parent | ff8f3fd59e95aef5a5e38c55a6de161e2ff8f5f5 (diff) | |
| download | chromium_src-8f60e8e23491fd101deecfb6482fdd992a1e7dca.zip chromium_src-8f60e8e23491fd101deecfb6482fdd992a1e7dca.tar.gz chromium_src-8f60e8e23491fd101deecfb6482fdd992a1e7dca.tar.bz2 | |
Fixes crash in instant. The crash would occur if a malware was showing
and you hit escape. The regression is the result of converting to
TabContentsWrapper and not updating a set_delegate from
TabContentsWrapper to TabContents.
BUG=72518
TEST=none
Review URL: http://codereview.chromium.org/6523002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
| -rw-r--r-- | chrome/browser/instant/instant_loader.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 7e2b6f0..67c1501 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -619,7 +619,7 @@ TabContentsWrapper* InstantLoader::ReleasePreviewContents( Source<NavigationController>(&preview_contents_->controller())); #endif } - preview_contents_->set_delegate(NULL); + preview_contents_->tab_contents()->set_delegate(NULL); preview_tab_contents_delegate_->Reset(); ready_ = false; } |