[Cleanup] rename WebContentsModalDialogManager::IsShowingDialog() to IsDialogActive()
The function tests whether web contents modal dialogs are active, rather
than if they are actually showing. This updates the name accordingly
and resolves the TODO.
BUG=157161
Review URL: https://chromiumcodereview.appspot.com/23815006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222289 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index 70c3db95..8974e53 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -847,7 +847,7 @@
// Verify that the shell window has a dialog attached.
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents);
- EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());
+ EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());
// Close the constrained window and wait for the reply to the permission
// request.
diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc
index 6dc64b3..ff0be0d1 100644
--- a/chrome/browser/repost_form_warning_browsertest.cc
+++ b/chrome/browser/repost_form_warning_browsertest.cc
@@ -42,13 +42,13 @@
// There should only be one dialog open.
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents);
- EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());
+ EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());
// Navigate away from the page (this is when the test usually crashes).
ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("bar"));
// The dialog should've been closed.
- EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());
+ EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());
}
// If becomes flaky, disable on Windows and use http://crbug.com/47228
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 9c5baca3..991d5b92 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -221,7 +221,7 @@
bool IsShowingWebContentsModalDialog() const {
return WebContentsModalDialogManager::FromWebContents(
browser()->tab_strip_model()->GetActiveWebContents())->
- IsShowingDialog();
+ IsDialogActive();
}
static bool GetFilePathWithHostAndPortReplacement(
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 48c7076d..fc3438dd 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -187,7 +187,7 @@
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents);
- return web_contents_modal_dialog_manager->IsShowingDialog();
+ return web_contents_modal_dialog_manager->IsDialogActive();
}
bool PrintPreviewShowing(const Browser* browser) {
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index cc8c86e..eccb29c 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1584,7 +1584,7 @@
if (!contents)
return NO;
return !WebContentsModalDialogManager::FromWebContents(contents)->
- IsShowingDialog();
+ IsDialogActive();
}
// TabStripControllerDelegate protocol.
diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm
index 0840e8a..ca4d5b1 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 @@
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.
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm
index 117e347..1be581b 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm
@@ -19,16 +19,16 @@
browser()->tab_strip_model()->GetActiveWebContents();
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());
// Deletes itself.
CollectedCookiesMac* dialog = new CollectedCookiesMac(
browser()->tab_strip_model()->GetActiveWebContents());
- EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());
+ EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());
dialog->PerformClose();
content::RunAllPendingInMessageLoop();
- EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());
+ EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());
}
IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Outlets) {
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index 13493e4..8f906ea 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -210,7 +210,7 @@
web_modal::WebContentsModalDialogManager::FromWebContents(
host_->host_contents());
if (modalDialogManager &&
- modalDialogManager->IsShowingDialog()) {
+ modalDialogManager->IsDialogActive()) {
return;
}
}
@@ -236,7 +236,7 @@
web_modal::WebContentsModalDialogManager::FromWebContents(
host_->host_contents());
if (modalDialogManager &&
- modalDialogManager->IsShowingDialog()) {
+ modalDialogManager->IsDialogActive()) {
ignoreWindowDidResignKey_ = YES;
return;
}
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm
index bf09482..ee7efb5 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm
@@ -44,7 +44,7 @@
browser()->tab_strip_model()->GetActiveWebContents();
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());
net::X509Certificate* cert = NULL;
int count = 0;
@@ -58,13 +58,13 @@
[selector displayForWebContents:web_contents];
content::RunAllPendingInMessageLoop();
EXPECT_TRUE([selector panel]);
- 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());
EXPECT_EQ(NULL, cert);
EXPECT_EQ(1, count);
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc
index fa83e5c..92d830b 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -192,7 +192,7 @@
web_modal::WebContentsModalDialogManager* modal_dialog_manager =
web_modal::WebContentsModalDialogManager::FromWebContents(contents);
if (modal_dialog_manager)
- data->blocked = modal_dialog_manager->IsShowingDialog();
+ data->blocked = modal_dialog_manager->IsDialogActive();
contents_data_.insert(contents_data_.begin() + index, data);
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
index 4bbc0c2..4421cd6 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 @@
// 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 @@
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 @@
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
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
index 8abb284e..04dc7b8 100644
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
@@ -77,7 +77,7 @@
// TODO(erg): WebContents used to own web contents modal dialogs, which is
// why this is here. Eventually this should be ported to a containing view
// specializing in web contents modal dialog management.
- if (web_contents_modal_dialog_manager->IsShowingDialog()) {
+ if (web_contents_modal_dialog_manager->IsDialogActive()) {
web_contents_modal_dialog_manager->FocusTopmostDialog();
return true;
}
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
index e77be91..ecaf3cf 100644
--- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
@@ -52,7 +52,7 @@
bool IsShowingWebContentsModalDialog(WebContents* web_contents) const {
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents);
- return web_contents_modal_dialog_manager->IsShowingDialog();
+ return web_contents_modal_dialog_manager->IsDialogActive();
}
};
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
index 0f48f49..700d81f 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -36,7 +36,7 @@
bool IsShowingWebContentsModalDialog(WebContents* tab) {
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(tab);
- return web_contents_modal_dialog_manager->IsShowingDialog();
+ return web_contents_modal_dialog_manager->IsDialogActive();
}
} // namespace
diff --git a/components/web_modal/web_contents_modal_dialog_manager.cc b/components/web_modal/web_contents_modal_dialog_manager.cc
index 949abbf..4d8aca7 100644
--- a/components/web_modal/web_contents_modal_dialog_manager.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager.cc
@@ -45,7 +45,7 @@
}
}
-bool WebContentsModalDialogManager::IsShowingDialog() const {
+bool WebContentsModalDialogManager::IsDialogActive() const {
return !child_dialogs_.empty();
}
diff --git a/components/web_modal/web_contents_modal_dialog_manager.h b/components/web_modal/web_contents_modal_dialog_manager.h
index eff0e2c..58d5520 100644
--- a/components/web_modal/web_contents_modal_dialog_manager.h
+++ b/components/web_modal/web_contents_modal_dialog_manager.h
@@ -39,12 +39,10 @@
void ShowDialog(NativeWebContentsModalDialog dialog);
// Returns true if any dialogs are active and not closed.
- // TODO(wittman): Give this a better name, since it can return true if no
- // dialogs are displayed.
- bool IsShowingDialog() const;
+ bool IsDialogActive() const;
- // Focus the topmost modal dialog. IsShowingDialog() must be true when
- // calling this function.
+ // Focus the topmost modal dialog. IsDialogActive() must be true when calling
+ // this function.
void FocusTopmostDialog();
// Set to true to close the window when a page load starts on the WebContents.
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 31af59c3..bb86691 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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_api->CloseAllDialogs();
EXPECT_FALSE(delegate->web_contents_blocked());
- EXPECT_FALSE(manager->IsShowingDialog());
+ EXPECT_FALSE(manager->IsDialogActive());
EXPECT_EQ(kWindowCount, native_manager->GetCloseCount());
}
