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

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 24436003: Don't leave renderer process frozen when canceling JavaScript dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clear callback after calling. Created 7 years, 3 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
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 56901bcdfb435f9800494117dd64cd875f9a7148..4d1813f58a860c1666bf3bfaa6ab58c403412f4c 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -231,6 +231,9 @@ class TestInterstitialPage : public content::InterstitialPageDelegate {
void Proceed() {
interstitial_page_->Proceed();
}
+ void DontProceed() {
+ interstitial_page_->DontProceed();
+ }
virtual std::string GetHTMLContents() OVERRIDE {
return "<h1>INTERSTITIAL</h1>";
@@ -1727,10 +1730,13 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialClosesDialogs) {
InterstitialObserver observer(contents,
base::Closure(),
loop_runner->QuitClosure());
- interstitial->Proceed();
+ interstitial->DontProceed();
loop_runner->Run();
// interstitial is deleted now.
}
+
+ // Make sure input events still work in the renderer process.
+ EXPECT_FALSE(contents->GetRenderProcessHost()->IgnoreInputEvents());
}
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698