| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/gfx/rect.h" | 9 #include "base/gfx/rect.h" |
| 10 #include "base/keyboard_codes.h" | 10 #include "base/keyboard_codes.h" |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 } | 170 } |
| 171 | 171 |
| 172 EXPECT_GE(new_popup_window_count, popup_window_count); | 172 EXPECT_GE(new_popup_window_count, popup_window_count); |
| 173 EXPECT_LE(new_popup_window_count, kMaxPopupWindows); | 173 EXPECT_LE(new_popup_window_count, kMaxPopupWindows); |
| 174 popup_window_count = new_popup_window_count; | 174 popup_window_count = new_popup_window_count; |
| 175 } | 175 } |
| 176 } | 176 } |
| 177 | 177 |
| 178 // Make sure that we refuse to close windows when a constrained popup is | 178 // Make sure that we refuse to close windows when a constrained popup is |
| 179 // displayed. | 179 // displayed. |
| 180 TEST_F(BlockedPopupContainerInteractiveTest, WindowOpenWindowClosePopup) { | 180 TEST_F(BlockedPopupContainerInteractiveTest, FLAKY_WindowOpenWindowClosePopup) { |
| 181 NavigateMainTabTo("openclose_main.html"); | 181 NavigateMainTabTo("openclose_main.html"); |
| 182 SimulateClickInCenterOf(window_); | 182 SimulateClickInCenterOf(window_); |
| 183 | 183 |
| 184 ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 5000)); | 184 ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 5000)); |
| 185 | 185 |
| 186 // Make sure we have a blocked popup notification | 186 // Make sure we have a blocked popup notification |
| 187 scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1)); | 187 scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1)); |
| 188 ASSERT_TRUE(popup_browser.get()); | 188 ASSERT_TRUE(popup_browser.get()); |
| 189 scoped_refptr<WindowProxy> popup_window(popup_browser->GetWindow()); | 189 scoped_refptr<WindowProxy> popup_window(popup_browser->GetWindow()); |
| 190 ASSERT_TRUE(popup_window.get()); | 190 ASSERT_TRUE(popup_window.get()); |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 ASSERT_TRUE(window->SimulateOSKeyPress( | 279 ASSERT_TRUE(window->SimulateOSKeyPress( |
| 280 base::VKEY_TAB, views::Event::EF_CONTROL_DOWN)); | 280 base::VKEY_TAB, views::Event::EF_CONTROL_DOWN)); |
| 281 ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms())); | 281 ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms())); |
| 282 | 282 |
| 283 ASSERT_TRUE(browser->ActivateTab(1)); | 283 ASSERT_TRUE(browser->ActivateTab(1)); |
| 284 ASSERT_TRUE(window->SimulateOSKeyPress( | 284 ASSERT_TRUE(window->SimulateOSKeyPress( |
| 285 base::VKEY_W, views::Event::EF_CONTROL_DOWN)); | 285 base::VKEY_W, views::Event::EF_CONTROL_DOWN)); |
| 286 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); | 286 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); |
| 287 } | 287 } |
| 288 #endif | 288 #endif |
| OLD | NEW |