athena/content/web_activity.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: athena/content/web_activity.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

Index: athena/content/web_activity.cc

diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc

index a6bdb82b51a516046566685066eb1c40b0b0422f..c7ad8999db2a11aacaf6d88cf12b04acd00e083e 100644

--- a/athena/content/web_activity.cc

+++ b/athena/content/web_activity.cc

@@ -366,7 +366,7 @@ class AthenaWebView : public views::WebView {

}

content::JavaScriptDialogManager* GetJavaScriptDialogManager() override {

- return GetJavaScriptDialogManagerInstance();

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

}

content::ColorChooser* OpenColorChooser(

« no previous file with comments | « no previous file | athena/extensions/athena_javascript_native_dialog_factory.cc » ('j') | chrome/browser/ui/views/frame/browser_view.cc » ('J')