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

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, 1 month 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') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 0b23a79b04523c74af88fb5f88792fd3b99246d6..1e2a0e61b4fb521f8d2f3a19f0ad7370d818ad5e 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(
« no previous file with comments | « chrome/browser/devtools/devtools_window.h ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698