chrome/browser/prerender/prerender_contents.cc - Issue 6627063: Ignore JavaScript messages (alert/confirm/prompt) during unload handlers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6627063: Ignore JavaScript messages (alert/confirm/prompt) during unload handlers. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Added a browsertest Created 9 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/prerender/prerender_contents.cc

diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc

index 69614d45e97e95768e298495d389a5880b1c28d2..307d828938b4f3937a5cb8cf9b6217876c800186 100644

--- a/chrome/browser/prerender/prerender_contents.cc

+++ b/chrome/browser/prerender/prerender_contents.cc

@@ -219,6 +219,7 @@ void PrerenderContents::RunJavaScriptMessage(

const std::wstring& default_prompt,

const GURL& frame_url,

const int flags,

+ const bool unload_handler_being_run,

IPC::Message* reply_msg,

bool* did_suppress_message) {

// Always suppress JavaScript messages if they're triggered by a page being

« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/tab_contents/background_contents.h » ('j') | no next file with comments »