chrome/browser/unload_browsertest.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/unload_browsertest.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

« chrome/browser/ui/views/frame/browser_view.cc ('K') | « chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.cc ('k') | chrome/test/base/ui_test_utils.h » ('j') | components/app_modal_dialogs/app_modal_dialog.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/unload_browsertest.cc

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

index 2378f02d61b1e458bbd552c671ea3df45ab89373..5004688e8aaa67b6808f094160696df0c1477009 100644

--- a/chrome/browser/unload_browsertest.cc

+++ b/chrome/browser/unload_browsertest.cc

@@ -178,10 +178,11 @@ class UnloadTest : public InProcessBrowserTest {

// If |accept| is true, simulates user clicking OK, otherwise simulates

// clicking Cancel.

void ClickModalDialogButton(bool accept) {

- AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog();

+ app_modal_dialogs::AppModalDialog* dialog =

+ ui_test_utils::WaitForAppModalDialog();

ASSERT_TRUE(dialog->IsJavaScriptModalDialog());

- JavaScriptAppModalDialog* js_dialog =

- static_cast<JavaScriptAppModalDialog*>(dialog);

+ app_modal_dialogs::JavaScriptAppModalDialog* js_dialog =

+ static_cast<app_modal_dialogs::JavaScriptAppModalDialog*>(dialog);

if (accept)

js_dialog->native_dialog()->AcceptAppModalDialog();

else