chrome/browser/devtools/devtools_window.cc - Issue 691823002: Add WebContents source to methods in WebContentsDelegate

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/devtools/devtools_window.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

« no previous file with comments | « chrome/browser/devtools/devtools_window.h ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | chrome/browser/prerender/prerender_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/devtools/devtools_window.cc

diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc

index f3c651a50610cb3c7752fc6d1af257ad11605d29..fcfc382e478c2dde0053704a6017da54f02c43f2 100644

--- a/chrome/browser/devtools/devtools_window.cc

+++ b/chrome/browser/devtools/devtools_window.cc

@@ -929,11 +929,13 @@ void DevToolsWindow::HandleKeyboardEvent(

inspected_window->HandleKeyboardEvent(event);

}

-content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {

+content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager(

+ WebContents* source) {

WebContents* inspected_web_contents = GetInspectedWebContents();

- return (inspected_web_contents && inspected_web_contents->GetDelegate()) ?

- inspected_web_contents->GetDelegate()->GetJavaScriptDialogManager() :

- content::WebContentsDelegate::GetJavaScriptDialogManager();

+ return (inspected_web_contents && inspected_web_contents->GetDelegate())

+ ? inspected_web_contents->GetDelegate()

+ ->GetJavaScriptDialogManager(inspected_web_contents)

+ : content::WebContentsDelegate::GetJavaScriptDialogManager(source);

}

content::ColorChooser* DevToolsWindow::OpenColorChooser(