chrome/browser/ui/views/constrained_window_views_browsertest.cc - Issue 23815006: [Cleanup] rename WebContentsModalDialogManager::IsShowingDialog() to IsDialogActive()

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/views/constrained_window_views_browsertest.cc

Issue 23815006: [Cleanup] rename WebContentsModalDialogManager::IsShowingDialog() to IsDialogActive() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 3 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

« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model.cc ('k') | chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/constrained_window_views_browsertest.cc

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

index 4bbc0c2902b776ec3923b21202c40fe94174c3c6..4421cd6fbcbf004c005d04eb0ef904c7b9f7cfaf 100644

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

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

@@ -177,7 +177,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {

// test_dialog1's text field should still be the view that has focus.

EXPECT_EQ(test_dialog1->GetInitiallyFocusedView(),

focus_manager->GetFocusedView());

- ASSERT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());

+ ASSERT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());

// Now send a VKEY_RETURN to the browser. This should result in closing

// test_dialog1.

@@ -187,7 +187,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {

EXPECT_TRUE(test_dialog1->done());

EXPECT_FALSE(test_dialog2->done());

- EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());

+ EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());

// test_dialog2 will be shown. Focus should be on test_dialog2's text field.

EXPECT_EQ(test_dialog2->GetInitiallyFocusedView(),

@@ -215,7 +215,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {

ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)));

content::RunAllPendingInMessageLoop();

EXPECT_TRUE(test_dialog2->done());

- EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());

+ EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());

}

// Tests that the constrained window is closed properly when its tab is