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

Unified Diff: chrome/browser/ui/constrained_window_tab_helper_unittest.cc

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stage changes to preserve history Created 8 years 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
Index: chrome/browser/ui/constrained_window_tab_helper_unittest.cc
diff --git a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
index 03fcc706a14a8b0fd78e2d2d0127e6ed836b1589..2ff348b014c2524afe1452ce8a0652f019c60f57 100644
--- a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
+++ b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
@@ -26,17 +26,17 @@ class ConstrainedWindowTabHelperTest : public ChromeRenderViewHostTestHarness {
content::TestBrowserThread ui_thread_;
};
-class ConstrainedWindowCloseTest : public ConstrainedWindow {
+class WebContentsModalDialogCloseTest : public ConstrainedWindow {
public:
- explicit ConstrainedWindowCloseTest(content::WebContents* web_contents)
+ explicit WebContentsModalDialogCloseTest(content::WebContents* web_contents)
: web_contents_(web_contents) {
}
- virtual void ShowConstrainedWindow() {}
- virtual void FocusConstrainedWindow() {}
- virtual ~ConstrainedWindowCloseTest() {}
+ virtual void ShowWebContentsModalDialog() {}
+ virtual void FocusWebContentsModalDialog() {}
+ virtual ~WebContentsModalDialogCloseTest() {}
- virtual void CloseConstrainedWindow() {
+ virtual void CloseWebContentsModalDialog() {
ConstrainedWindowTabHelper* constrained_window_tab_helper =
ConstrainedWindowTabHelper::FromWebContents(web_contents_);
constrained_window_tab_helper->WillClose(this);
@@ -48,16 +48,16 @@ class ConstrainedWindowCloseTest : public ConstrainedWindow {
};
TEST_F(ConstrainedWindowTabHelperTest, ConstrainedWindows) {
- ConstrainedWindowCloseTest window(web_contents());
+ WebContentsModalDialogCloseTest window(web_contents());
window.close_count = 0;
ConstrainedWindowTabHelper* constrained_window_tab_helper =
ConstrainedWindowTabHelper::FromWebContents(web_contents());
const int kWindowCount = 4;
for (int i = 0; i < kWindowCount; i++)
- constrained_window_tab_helper->AddConstrainedDialog(&window);
+ constrained_window_tab_helper->AddDialog(&window);
EXPECT_EQ(window.close_count, 0);
- constrained_window_tab_helper->CloseConstrainedWindows();
+ constrained_window_tab_helper->CloseAllDialogs();
EXPECT_EQ(window.close_count, kWindowCount);
}
« no previous file with comments | « chrome/browser/ui/constrained_window_tab_helper_delegate.cc ('k') | chrome/browser/ui/gtk/collected_cookies_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698