chrome/browser/ui/browser.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/ui/browser.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: 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/extensions/chrome_extension_host_delegate.cc ('k') | chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc » ('j') | components/app_modal_dialogs/javascript_dialog_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 45257c28e330605ec523233f8a82d6b903a4f6aa..7b1af9f021aa3101826015ccdfbd1e1059f21695 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -1624,7 +1624,7 @@ void Browser::DidNavigateToPendingEntry(WebContents* web_contents) {

}

content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() {

- return GetJavaScriptDialogManagerInstance();

+ return JavaScriptDialogManager::GetInstance();

}

content::ColorChooser* Browser::OpenColorChooser(