Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(836)

Unified Diff: components/web_modal/web_contents_modal_dialog_manager_unittest.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 | « components/web_modal/web_contents_modal_dialog_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_modal/web_contents_modal_dialog_manager_unittest.cc
diff --git a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
index 31af59c39cb67941a39e12ef6bfe6626db849abc..bb866916264e2852a5cbf2df89da6f69987d1b9b 100644
--- a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
@@ -172,7 +172,7 @@ TEST_F(WebContentsModalDialogManagerTest, WebContentsVisible) {
EXPECT_EQ(TestNativeWebContentsModalDialogManager::SHOWN,
native_manager->GetDialogState(dialog1));
- EXPECT_TRUE(manager->IsShowingDialog());
+ EXPECT_TRUE(manager->IsDialogActive());
EXPECT_TRUE(delegate->web_contents_blocked());
}
@@ -188,7 +188,7 @@ TEST_F(WebContentsModalDialogManagerTest, WebContentsNotVisible) {
EXPECT_EQ(TestNativeWebContentsModalDialogManager::NOT_SHOWN,
native_manager->GetDialogState(dialog1));
- EXPECT_TRUE(manager->IsShowingDialog());
+ EXPECT_TRUE(manager->IsDialogActive());
EXPECT_TRUE(delegate->web_contents_blocked());
}
@@ -219,7 +219,7 @@ TEST_F(WebContentsModalDialogManagerTest, VisibilityObservation) {
manager->ShowDialog(dialog1);
- EXPECT_TRUE(manager->IsShowingDialog());
+ EXPECT_TRUE(manager->IsDialogActive());
EXPECT_TRUE(delegate->web_contents_blocked());
EXPECT_EQ(TestNativeWebContentsModalDialogManager::SHOWN,
native_manager->GetDialogState(dialog1));
@@ -229,7 +229,7 @@ TEST_F(WebContentsModalDialogManagerTest, VisibilityObservation) {
content::NotificationService::AllSources(),
content::Details<bool>(&web_contents_visible));
- EXPECT_TRUE(manager->IsShowingDialog());
+ EXPECT_TRUE(manager->IsDialogActive());
EXPECT_TRUE(delegate->web_contents_blocked());
EXPECT_EQ(TestNativeWebContentsModalDialogManager::HIDDEN,
native_manager->GetDialogState(dialog1));
@@ -239,7 +239,7 @@ TEST_F(WebContentsModalDialogManagerTest, VisibilityObservation) {
content::NotificationService::AllSources(),
content::Details<bool>(&web_contents_visible));
- EXPECT_TRUE(manager->IsShowingDialog());
+ EXPECT_TRUE(manager->IsDialogActive());
EXPECT_TRUE(delegate->web_contents_blocked());
EXPECT_EQ(TestNativeWebContentsModalDialogManager::SHOWN,
native_manager->GetDialogState(dialog1));
@@ -285,7 +285,7 @@ TEST_F(WebContentsModalDialogManagerTest, CloseDialogs) {
native_manager->CloseDialog(dialog1);
- EXPECT_TRUE(manager->IsShowingDialog());
+ EXPECT_TRUE(manager->IsDialogActive());
EXPECT_TRUE(delegate->web_contents_blocked());
EXPECT_EQ(TestNativeWebContentsModalDialogManager::CLOSED,
native_manager->GetDialogState(dialog1));
@@ -298,7 +298,7 @@ TEST_F(WebContentsModalDialogManagerTest, CloseDialogs) {
native_manager->CloseDialog(dialog3);
- EXPECT_TRUE(manager->IsShowingDialog());
+ EXPECT_TRUE(manager->IsDialogActive());
EXPECT_TRUE(delegate->web_contents_blocked());
EXPECT_EQ(TestNativeWebContentsModalDialogManager::SHOWN,
native_manager->GetDialogState(dialog2));
@@ -309,7 +309,7 @@ TEST_F(WebContentsModalDialogManagerTest, CloseDialogs) {
native_manager->CloseDialog(dialog2);
- EXPECT_TRUE(manager->IsShowingDialog());
+ EXPECT_TRUE(manager->IsDialogActive());
EXPECT_TRUE(delegate->web_contents_blocked());
EXPECT_EQ(TestNativeWebContentsModalDialogManager::CLOSED,
native_manager->GetDialogState(dialog2));
@@ -318,7 +318,7 @@ TEST_F(WebContentsModalDialogManagerTest, CloseDialogs) {
native_manager->CloseDialog(dialog4);
- EXPECT_FALSE(manager->IsShowingDialog());
+ EXPECT_FALSE(manager->IsDialogActive());
EXPECT_FALSE(delegate->web_contents_blocked());
EXPECT_EQ(TestNativeWebContentsModalDialogManager::CLOSED,
native_manager->GetDialogState(dialog4));
@@ -334,7 +334,7 @@ TEST_F(WebContentsModalDialogManagerTest, CloseAllDialogs) {
test_api->CloseAllDialogs();
EXPECT_FALSE(delegate->web_contents_blocked());
- EXPECT_FALSE(manager->IsShowingDialog());
+ EXPECT_FALSE(manager->IsDialogActive());
EXPECT_EQ(kWindowCount, native_manager->GetCloseCount());
}
« no previous file with comments | « components/web_modal/web_contents_modal_dialog_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698