components/app_modal_dialogs/javascript_app_modal_dialog.cc - Issue 666533007: Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs

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: components/app_modal_dialogs/javascript_app_modal_dialog.cc

Issue 666533007: Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs (Closed) Base URL: https://chromium.googlesource.com/chromium/src@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

« components/app_modal_dialogs/DEPS ('K') | « components/app_modal_dialogs/cocoa/DEPS ('k') | components/app_modal_dialogs/javascript_dialog_manager.h » ('j') | components/app_modal_dialogs/javascript_dialog_manager_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/app_modal_dialogs/javascript_app_modal_dialog.cc

diff --git a/components/app_modal_dialogs/javascript_app_modal_dialog.cc b/components/app_modal_dialogs/javascript_app_modal_dialog.cc

index 99adc4b15e5ac38632aaed48d726e0dcf3f5821a..86dc6fdb8866b0b24a8d6bf2ef9f88b0fce35698 100644

--- a/components/app_modal_dialogs/javascript_app_modal_dialog.cc

+++ b/components/app_modal_dialogs/javascript_app_modal_dialog.cc

@@ -4,6 +4,7 @@

#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"

+#include "components/app_modal_dialogs/javascript_dialog_manager_client.h"

#include "components/app_modal_dialogs/native_app_modal_dialog.h"

#include "content/public/browser/web_contents.h"

#include "ui/gfx/text_elider.h"

@@ -94,9 +95,8 @@ NativeAppModalDialog* JavaScriptAppModalDialog::CreateNativeDialog() {

parent_window = NULL;

}

#endif // defined(USE_AURA)

- return NativeAppModalDialog::CreateNativeJavaScriptPrompt(this,

- parent_window);

+ return GetJavaScriptDialogManagerClient()->CreateNativeJavaScriptPrompt(

+ this, parent_window);

}

bool JavaScriptAppModalDialog::IsJavaScriptModalDialog() {