Add WebContents source to methods in WebContentsDelegate
The added parameter helps us avoid a potential timing-related security issue. The UI can be instructed to open a new tab and show a dialog roughly at the same time, and since it's handled asynchronously the dialog may end up in front of the new tab. Knowing what web contents issued the dialog would allow us to prevent that from happening.
BUG=428793
Review URL: https://codereview.chromium.org/691823002
Cr-Commit-Position: refs/heads/master@{#304781}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index e6f8713..d0a157c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3396,15 +3396,14 @@
// want the hidden page's dialogs to interfere with the interstitial.
bool suppress_this_message =
static_cast<RenderFrameHostImpl*>(render_frame_host)->is_swapped_out() ||
- ShowingInterstitialPage() ||
- !delegate_ ||
- delegate_->ShouldSuppressDialogs() ||
- !delegate_->GetJavaScriptDialogManager();
+ ShowingInterstitialPage() || !delegate_ ||
+ delegate_->ShouldSuppressDialogs(this) ||
+ !delegate_->GetJavaScriptDialogManager(this);
if (!suppress_this_message) {
std::string accept_lang = GetContentClient()->browser()->
GetAcceptLangs(GetBrowserContext());
- dialog_manager_ = delegate_->GetJavaScriptDialogManager();
+ dialog_manager_ = delegate_->GetJavaScriptDialogManager(this);
dialog_manager_->RunJavaScriptDialog(
this,
frame_url.GetOrigin(),
@@ -3444,17 +3443,16 @@
delegate_->WillRunBeforeUnloadConfirm();
bool suppress_this_message =
- rfhi->rfh_state() != RenderFrameHostImpl::STATE_DEFAULT ||
- !delegate_ ||
- delegate_->ShouldSuppressDialogs() ||
- !delegate_->GetJavaScriptDialogManager();
+ rfhi->rfh_state() != RenderFrameHostImpl::STATE_DEFAULT || !delegate_ ||
+ delegate_->ShouldSuppressDialogs(this) ||
+ !delegate_->GetJavaScriptDialogManager(this);
if (suppress_this_message) {
rfhi->JavaScriptDialogClosed(reply_msg, true, base::string16(), true);
return;
}
is_showing_before_unload_dialog_ = true;
- dialog_manager_ = delegate_->GetJavaScriptDialogManager();
+ dialog_manager_ = delegate_->GetJavaScriptDialogManager(this);
dialog_manager_->RunBeforeUnloadDialog(
this, message, is_reload,
base::Bind(&WebContentsImpl::OnDialogClosed, base::Unretained(this),
