chrome/browser/android/chrome_web_contents_delegate_android.cc - Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

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/android/chrome_web_contents_delegate_android.cc

Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: namespace 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

« athena/extensions/athena_javascript_native_dialog_factory.cc ('K') | « athena/extensions/extensions_delegate.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_web_contents_delegate_android.cc

diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc

index 6de33ca3c9849d0eb7ef48581f69b54abb695e77..352489eb5eaee610b094d3c316bf36027497bc04 100644

--- a/chrome/browser/android/chrome_web_contents_delegate_android.cc

+++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc

@@ -215,7 +215,7 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply(

content::JavaScriptDialogManager*

ChromeWebContentsDelegateAndroid::GetJavaScriptDialogManager() {

- return GetJavaScriptDialogManagerInstance();

+ return app_modal_dialogs::JavaScriptDialogManager::GetInstance();

}

void ChromeWebContentsDelegateAndroid::RequestMediaAccessPermission(