summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 02:38:43 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 02:38:43 +0000
commitbaa50890a348a680b3b969320ea413a6d1f4ad9c (patch)
tree7d74e5b024118f63bf409900ce52ac4f58fc0028 /chrome/browser/instant
parent022d739264293f90c044318f7c3fd9c3a12e46df (diff)
downloadchromium_src-baa50890a348a680b3b969320ea413a6d1f4ad9c.zip
chromium_src-baa50890a348a680b3b969320ea413a6d1f4ad9c.tar.gz
chromium_src-baa50890a348a680b3b969320ea413a6d1f4ad9c.tar.bz2
Fixes crash in instant that would result if the preview page showed a
popup. BUG=57361 TEST=see bug Review URL: http://codereview.chromium.org/3536012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
-rw-r--r--chrome/browser/instant/instant_loader.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index adae0b8..0dfb85f 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -327,9 +327,6 @@ class InstantLoader::TabContentsDelegateImpl : public TabContentsDelegate {
loader_->ShowPreview();
}
}
- virtual TabContents* GetConstrainingContents(TabContents* source) {
- return NULL;
- }
virtual void ToolbarSizeChanged(TabContents* source, bool is_animating) {}
virtual void URLStarredChanged(TabContents* source, bool starred) {}
virtual void UpdateTargetURL(TabContents* source, const GURL& url) {}