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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 691823002: Add WebContents source to methods in WebContentsDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 7ce5ac24f15e3af3258d8dbdd18c69eaf6017762..44e7da06964b788f1bcdce4596c64ee03b73e544 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3380,15 +3380,14 @@ void WebContentsImpl::RunJavaScriptMessage(
// 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(),
@@ -3428,17 +3427,16 @@ void WebContentsImpl::RunBeforeUnloadConfirm(
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),

Powered by Google App Engine
This is Rietveld 408576698