diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 18:02:19 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 18:02:19 +0000 |
| commit | 61b5009276bf52f14af3984724a410fb9a7bd1f5 (patch) | |
| tree | 7a9ba5610891523fc38c07bffd9cb281765331e2 /chrome/browser/instant | |
| parent | 6b91c40ac881e3512d204256b87c2b4ed83beb0f (diff) | |
| download | chromium_src-61b5009276bf52f14af3984724a410fb9a7bd1f5.zip chromium_src-61b5009276bf52f14af3984724a410fb9a7bd1f5.tar.gz chromium_src-61b5009276bf52f14af3984724a410fb9a7bd1f5.tar.bz2 | |
Makes it so the hung renderer dialog isn't shown if the page that is
hung is being shown by instant.
This also fixes a crash if the instant preview hung. The crash occurred because when HungRendererDialogView::ShowForTabContents set the bounds a synchronous focus change was triggered, which caused the instant preview to be destroyed, and when hung_pages_table_model_->InitForTabContents(contents) was invoked the contents was destroyed and no renderer.
BUG=58853
TEST=see bug
Review URL: http://codereview.chromium.org/6286055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
| -rw-r--r-- | chrome/browser/instant/instant_loader.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index e4ee07d..2bb01a0 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -373,6 +373,13 @@ class InstantLoader::TabContentsDelegateImpl loader_->PageDoesntSupportInstant(user_typed_before_load_); } + virtual bool ShouldShowHungRendererDialog() { + // If we allow the hung renderer dialog to be shown it'll gain focus, + // stealing focus from the omnibox causing instant to be cancelled. Return + // false so that doesn't happen. + return false; + } + private: typedef std::vector<scoped_refptr<history::HistoryAddPageArgs> > AddPageVector; |