chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm - 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/cocoa/certificate_viewer_mac_browsertest.mm

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/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm

index 0840e8a32035daefc74ec46f4cd3a30132baa60f..ca4d5b177c402c2a1c3d98c3c4fb839d1940fcd3 100644

--- a/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm

+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm

@@ -37,18 +37,18 @@ IN_PROC_BROWSER_TEST_F(SSLCertificateViewerCocoaTest, Basic) {

gfx::NativeWindow window = web_contents->GetView()->GetTopLevelNativeWindow();

WebContentsModalDialogManager* web_contents_modal_dialog_manager =

WebContentsModalDialogManager::FromWebContents(web_contents);

- EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());

+ EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());

ShowCertificateViewer(web_contents, window, cert.get());

content::RunAllPendingInMessageLoop();

- EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());

+ EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());

WebContentsModalDialogManager::TestApi test_api(

web_contents_modal_dialog_manager);

test_api.CloseAllDialogs();

content::RunAllPendingInMessageLoop();

- EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());

+ EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());

}

// Test that switching to another tab correctly hides the sheet.