Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: chrome/browser/tab_contents/interstitial_page.cc

Issue 56019: Fix crasher with SSL interstitial (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/interstitial_page.cc
===================================================================
--- chrome/browser/tab_contents/interstitial_page.cc (revision 12500)
+++ chrome/browser/tab_contents/interstitial_page.cc (working copy)
@@ -133,8 +133,13 @@
void InterstitialPage::Show() {
// If an interstitial is already showing, close it before showing the new one.
- if (tab_->interstitial_page())
- tab_->interstitial_page()->DontProceed();
+ // Be careful not to take an action on the old interstitial more than once.
+ if (tab_->interstitial_page()) {
+ if (tab_->interstitial_page()->action_taken())
+ tab_->interstitial_page()->Hide();
+ else
+ tab_->interstitial_page()->DontProceed();
+ }
// Block the resource requests for the render view host while it is hidden.
TakeActionOnResourceDispatcher(BLOCK);
« no previous file with comments | « chrome/browser/tab_contents/interstitial_page.h ('k') | chrome/browser/tab_contents/web_contents_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698