| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/browser/content_settings/host_content_settings_map.h" | |
| 8 #include "chrome/browser/profiles/profile.h" | |
| 9 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
| 11 #include "chrome/browser/ui/browser_tabstrip.h" | 9 #include "chrome/browser/ui/browser_tabstrip.h" |
| 12 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| 13 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" | 11 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" |
| 14 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" | 12 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" |
| 15 #include "chrome/test/base/ui_test_utils.h" | 13 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "content/public/browser/render_view_host.h" | 14 #include "content/public/browser/render_view_host.h" |
| 17 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 18 #include "content/public/common/url_constants.h" | 16 #include "content/public/common/url_constants.h" |
| 19 #include "content/public/test/test_navigation_observer.h" | 17 #include "content/public/test/test_navigation_observer.h" |
| 20 #if defined(OS_MACOSX) | 18 #if defined(OS_MACOSX) |
| 21 #include "base/mac/mac_util.h" | 19 #include "base/mac/mac_util.h" |
| 22 #endif | 20 #endif |
| 23 | 21 |
| 24 using content::WebContents; | 22 using content::WebContents; |
| 25 | 23 |
| 26 namespace { | |
| 27 | |
| 28 const FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("simple.html"); | |
| 29 | |
| 30 } // namespace | |
| 31 | |
| 32 class FullscreenControllerBrowserTest: public FullscreenControllerTest { | 24 class FullscreenControllerBrowserTest: public FullscreenControllerTest { |
| 33 protected: | |
| 34 void TestFullscreenMouseLockContentSettings(); | |
| 35 }; | 25 }; |
| 36 | 26 |
| 37 #if defined(OS_MACOSX) | |
| 38 // http://crbug.com/104265 | |
| 39 #define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen | |
| 40 #elif defined(OS_LINUX) | |
| 41 // http://crbug.com/137657 | |
| 42 #define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen | |
| 43 #else | |
| 44 #define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen | |
| 45 #endif | |
| 46 | |
| 47 // Tests that while in fullscreen creating a new tab will exit fullscreen. | |
| 48 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | |
| 49 MAYBE_TestNewTabExitsFullscreen) { | |
| 50 ASSERT_TRUE(test_server()->Start()); | |
| 51 | |
| 52 AddTabAtIndexAndWait( | |
| 53 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | |
| 54 | |
| 55 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 56 | |
| 57 { | |
| 58 FullscreenNotificationObserver fullscreen_observer; | |
| 59 AddTabAtIndexAndWait( | |
| 60 1, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | |
| 61 fullscreen_observer.Wait(); | |
| 62 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
| 63 } | |
| 64 } | |
| 65 | |
| 66 #if defined(OS_MACOSX) | |
| 67 // http://crbug.com/100467 | |
| 68 #define MAYBE_TestTabExitsItselfFromFullscreen \ | |
| 69 FAILS_TestTabExitsItselfFromFullscreen | |
| 70 #elif defined(OS_LINUX) | |
| 71 // http://crbug.com/146008 | |
| 72 #define MAYBE_TestTabExitsItselfFromFullscreen \ | |
| 73 DISABLED_TestTabExitsItselfFromFullscreen | |
| 74 #else | |
| 75 #define MAYBE_TestTabExitsItselfFromFullscreen TestTabExitsItselfFromFullscreen | |
| 76 #endif | |
| 77 | |
| 78 // Tests a tab exiting fullscreen will bring the browser out of fullscreen. | |
| 79 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | |
| 80 MAYBE_TestTabExitsItselfFromFullscreen) { | |
| 81 ASSERT_TRUE(test_server()->Start()); | |
| 82 | |
| 83 AddTabAtIndexAndWait( | |
| 84 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | |
| 85 | |
| 86 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 87 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); | |
| 88 } | |
| 89 | |
| 90 // Tests entering fullscreen and then requesting mouse lock results in | |
| 91 // buttons for the user, and that after confirming the buttons are dismissed. | |
| 92 #if defined(OS_LINUX) | |
| 93 // http://crbug.com/146008 | |
| 94 #define MAYBE_TestFullscreenBubbleMouseLockState \ | |
| 95 DISABLED_TestFullscreenBubbleMouseLockState | |
| 96 #else | |
| 97 #define MAYBE_TestFullscreenBubbleMouseLockState \ | |
| 98 TestFullscreenBubbleMouseLockState | |
| 99 #endif | |
| 100 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | |
| 101 MAYBE_TestFullscreenBubbleMouseLockState) { | |
| 102 ASSERT_TRUE(test_server()->Start()); | |
| 103 | |
| 104 AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), | |
| 105 content::PAGE_TRANSITION_TYPED); | |
| 106 AddTabAtIndexAndWait(1, GURL(chrome::kAboutBlankURL), | |
| 107 content::PAGE_TRANSITION_TYPED); | |
| 108 | |
| 109 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 110 | |
| 111 // Request mouse lock and verify the bubble is waiting for user confirmation. | |
| 112 RequestToLockMouse(true, false); | |
| 113 ASSERT_TRUE(IsMouseLockPermissionRequested()); | |
| 114 | |
| 115 // Accept mouse lock and verify bubble no longer shows confirmation buttons. | |
| 116 AcceptCurrentFullscreenOrMouseLockRequest(); | |
| 117 ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons()); | |
| 118 } | |
| 119 | |
| 120 // Helper method to be called by multiple tests. | |
| 121 // Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. | |
| 122 void FullscreenControllerBrowserTest::TestFullscreenMouseLockContentSettings() { | |
| 123 GURL url = test_server()->GetURL("simple.html"); | |
| 124 AddTabAtIndexAndWait(0, url, content::PAGE_TRANSITION_TYPED); | |
| 125 | |
| 126 // Validate that going fullscreen for a URL defaults to asking permision. | |
| 127 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 128 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 129 ASSERT_TRUE(IsFullscreenPermissionRequested()); | |
| 130 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); | |
| 131 | |
| 132 // Add content setting to ALLOW fullscreen. | |
| 133 HostContentSettingsMap* settings_map = | |
| 134 browser()->profile()->GetHostContentSettingsMap(); | |
| 135 ContentSettingsPattern pattern = | |
| 136 ContentSettingsPattern::FromURL(url); | |
| 137 settings_map->SetContentSetting( | |
| 138 pattern, ContentSettingsPattern::Wildcard(), | |
| 139 CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string(), | |
| 140 CONTENT_SETTING_ALLOW); | |
| 141 | |
| 142 // Now, fullscreen should not prompt for permission. | |
| 143 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 144 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 145 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 146 | |
| 147 // Leaving tab in fullscreen, now test mouse lock ALLOW: | |
| 148 | |
| 149 // Validate that mouse lock defaults to asking permision. | |
| 150 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 151 RequestToLockMouse(true, false); | |
| 152 ASSERT_TRUE(IsMouseLockPermissionRequested()); | |
| 153 LostMouseLock(); | |
| 154 | |
| 155 // Add content setting to ALLOW mouse lock. | |
| 156 settings_map->SetContentSetting( | |
| 157 pattern, ContentSettingsPattern::Wildcard(), | |
| 158 CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(), | |
| 159 CONTENT_SETTING_ALLOW); | |
| 160 | |
| 161 // Now, mouse lock should not prompt for permission. | |
| 162 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 163 RequestToLockMouse(true, false); | |
| 164 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 165 LostMouseLock(); | |
| 166 | |
| 167 // Leaving tab in fullscreen, now test mouse lock BLOCK: | |
| 168 | |
| 169 // Add content setting to BLOCK mouse lock. | |
| 170 settings_map->SetContentSetting( | |
| 171 pattern, ContentSettingsPattern::Wildcard(), | |
| 172 CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(), | |
| 173 CONTENT_SETTING_BLOCK); | |
| 174 | |
| 175 // Now, mouse lock should not be pending. | |
| 176 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 177 RequestToLockMouse(true, false); | |
| 178 ASSERT_FALSE(IsMouseLockPermissionRequested()); | |
| 179 } | |
| 180 | |
| 181 #if defined(OS_MACOSX) | |
| 182 // http://crbug.com/133831 | |
| 183 #define MAYBE_FullscreenMouseLockContentSettings \ | |
| 184 FLAKY_FullscreenMouseLockContentSettings | |
| 185 #elif defined(OS_LINUX) | |
| 186 // http://crbug.com/146008 | |
| 187 #define MAYBE_FullscreenMouseLockContentSettings \ | |
| 188 DISABLED_FullscreenMouseLockContentSettings | |
| 189 #else | |
| 190 #define MAYBE_FullscreenMouseLockContentSettings \ | |
| 191 FullscreenMouseLockContentSettings | |
| 192 #endif | |
| 193 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. | |
| 194 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, | |
| 195 MAYBE_FullscreenMouseLockContentSettings) { | |
| 196 TestFullscreenMouseLockContentSettings(); | |
| 197 } | |
| 198 | |
| 199 #if defined(OS_MACOSX) || defined(OS_LINUX) | |
| 200 // http://crbug.com/103912 Mac | |
| 201 // http://crbug.com/143930 Linux | |
| 202 #define MAYBE_BrowserFullscreenMouseLockContentSettings \ | |
| 203 DISABLED_BrowserFullscreenMouseLockContentSettings | |
| 204 #else | |
| 205 #define MAYBE_BrowserFullscreenMouseLockContentSettings \ | |
| 206 BrowserFullscreenMouseLockContentSettings | |
| 207 #endif | |
| 208 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK, | |
| 209 // but with the browser initiated in fullscreen mode first. | |
| 210 IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, | |
| 211 MAYBE_BrowserFullscreenMouseLockContentSettings) { | |
| 212 // Enter browser fullscreen first. | |
| 213 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); | |
| 214 TestFullscreenMouseLockContentSettings(); | |
| 215 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(false)); | |
| 216 } | |
| 217 | |
| 218 // Tests Fullscreen entered in Browser, then Tab mode, then exited via Browser. | |
| 219 #if defined(OS_MACOSX) | |
| 220 // http://crbug.com/103912 | |
| 221 #define MAYBE_BrowserFullscreenExit DISABLED_BrowserFullscreenExit | |
| 222 #else | |
| 223 #define MAYBE_BrowserFullscreenExit BrowserFullscreenExit | |
| 224 #endif | |
| 225 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, MAYBE_BrowserFullscreenExit) { | |
| 226 // Enter browser fullscreen. | |
| 227 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); | |
| 228 | |
| 229 // Enter tab fullscreen. | |
| 230 AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), | |
| 231 content::PAGE_TRANSITION_TYPED); | |
| 232 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 233 | |
| 234 // Exit browser fullscreen. | |
| 235 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(false)); | |
| 236 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
| 237 } | |
| 238 | |
| 239 // Tests Browser Fullscreen remains active after Tab mode entered and exited. | |
| 240 #if defined(OS_MACOSX) | |
| 241 // http://crbug.com/103912 | |
| 242 #define MAYBE_BrowserFullscreenAfterTabFSExit \ | |
| 243 DISABLED_BrowserFullscreenAfterTabFSExit | |
| 244 #elif defined(OS_LINUX) | |
| 245 // http://crbug.com/146008 | |
| 246 #define MAYBE_BrowserFullscreenAfterTabFSExit \ | |
| 247 DISABLED_BrowserFullscreenAfterTabFSExit | |
| 248 #else | |
| 249 #define MAYBE_BrowserFullscreenAfterTabFSExit BrowserFullscreenAfterTabFSExit | |
| 250 #endif | |
| 251 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | |
| 252 MAYBE_BrowserFullscreenAfterTabFSExit) { | |
| 253 // Enter browser fullscreen. | |
| 254 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); | |
| 255 | |
| 256 // Enter and then exit tab fullscreen. | |
| 257 AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), | |
| 258 content::PAGE_TRANSITION_TYPED); | |
| 259 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 260 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); | |
| 261 | |
| 262 // Verify browser fullscreen still active. | |
| 263 ASSERT_TRUE(IsFullscreenForBrowser()); | |
| 264 } | |
| 265 | |
| 266 // Tests fullscreen entered without permision prompt for file:// urls. | |
| 267 #if defined(OS_LINUX) | |
| 268 // http://crbug.com/146008 | |
| 269 #define MAYBE_FullscreenFileURL DISABLED_FullscreenFileURL | |
| 270 #else | |
| 271 #define MAYBE_FullscreenFileURL FullscreenFileURL | |
| 272 #endif | |
| 273 | |
| 274 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, MAYBE_FullscreenFileURL) { | |
| 275 ui_test_utils::NavigateToURL(browser(), | |
| 276 ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), | |
| 277 FilePath(kSimpleFile))); | |
| 278 | |
| 279 // Validate that going fullscreen for a file does not ask permision. | |
| 280 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 281 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 282 ASSERT_FALSE(IsFullscreenPermissionRequested()); | |
| 283 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); | |
| 284 } | |
| 285 | |
| 286 // Tests fullscreen is exited on page navigation. | |
| 287 // (Similar to mouse lock version in FullscreenControllerInteractiveTest) | |
| 288 #if defined(OS_MACOSX) | |
| 289 // http://crbug.com/103912 | |
| 290 #define MAYBE_TestTabExitsFullscreenOnNavigation \ | |
| 291 DISABLED_TestTabExitsFullscreenOnNavigation | |
| 292 #else | |
| 293 #define MAYBE_TestTabExitsFullscreenOnNavigation \ | |
| 294 TestTabExitsFullscreenOnNavigation | |
| 295 #endif | |
| 296 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | |
| 297 MAYBE_TestTabExitsFullscreenOnNavigation) { | |
| 298 ASSERT_TRUE(test_server()->Start()); | |
| 299 | |
| 300 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | |
| 301 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 302 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); | |
| 303 | |
| 304 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
| 305 } | |
| 306 | |
| 307 // Tests fullscreen is exited when navigating back. | |
| 308 // (Similar to mouse lock version in FullscreenControllerInteractiveTest) | |
| 309 #if defined(OS_MACOSX) | |
| 310 // http://crbug.com/103912 | |
| 311 #define MAYBE_TestTabExitsFullscreenOnGoBack \ | |
| 312 DISABLED_TestTabExitsFullscreenOnGoBack | |
| 313 #elif defined(OS_LINUX) | |
| 314 // http://crbug.com/146008 | |
| 315 #define MAYBE_TestTabExitsFullscreenOnGoBack \ | |
| 316 DISABLED_TestTabExitsFullscreenOnGoBack | |
| 317 #else | |
| 318 #define MAYBE_TestTabExitsFullscreenOnGoBack TestTabExitsFullscreenOnGoBack | |
| 319 #endif | |
| 320 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | |
| 321 MAYBE_TestTabExitsFullscreenOnGoBack) { | |
| 322 ASSERT_TRUE(test_server()->Start()); | |
| 323 | |
| 324 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | |
| 325 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); | |
| 326 | |
| 327 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 328 | |
| 329 GoBack(); | |
| 330 | |
| 331 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
| 332 } | |
| 333 | |
| 334 // Tests fullscreen is not exited on sub frame navigation. | |
| 335 // (Similar to mouse lock version in FullscreenControllerInteractiveTest) | |
| 336 #if defined(OS_LINUX) | |
| 337 // http://crbug.com/146008 | |
| 338 #define MAYBE_TestTabDoesntExitFullscreenOnSubFrameNavigation \ | |
| 339 DISABLED_TestTabDoesntExitFullscreenOnSubFrameNavigation | |
| 340 #else | |
| 341 #define MAYBE_TestTabDoesntExitFullscreenOnSubFrameNavigation \ | |
| 342 TestTabDoesntExitFullscreenOnSubFrameNavigation | |
| 343 #endif | |
| 344 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | |
| 345 MAYBE_TestTabDoesntExitFullscreenOnSubFrameNavigation) { | |
| 346 ASSERT_TRUE(test_server()->Start()); | |
| 347 | |
| 348 GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), | |
| 349 FilePath(kSimpleFile))); | |
| 350 GURL url_with_fragment(url.spec() + "#fragment"); | |
| 351 | |
| 352 ui_test_utils::NavigateToURL(browser(), url); | |
| 353 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 354 ui_test_utils::NavigateToURL(browser(), url_with_fragment); | |
| 355 ASSERT_TRUE(IsFullscreenForTabOrPending()); | |
| 356 } | |
| 357 | |
| 358 // Tests tab fullscreen exits, but browser fullscreen remains, on navigation. | |
| 359 #if defined(OS_MACOSX) | |
| 360 // http://crbug.com/103912 | |
| 361 #define MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks \ | |
| 362 DISABLED_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks | |
| 363 #elif defined(OS_LINUX) | |
| 364 // http://crbug.com/146008 | |
| 365 #define MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks \ | |
| 366 DISABLED_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks | |
| 367 #else | |
| 368 #define MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks \ | |
| 369 TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks | |
| 370 #endif | |
| 371 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | |
| 372 MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) { | |
| 373 ASSERT_TRUE(test_server()->Start()); | |
| 374 | |
| 375 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | |
| 376 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); | |
| 377 | |
| 378 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); | |
| 379 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | |
| 380 | |
| 381 GoBack(); | |
| 382 | |
| 383 ASSERT_TRUE(IsFullscreenForBrowser()); | |
| 384 ASSERT_FALSE(IsFullscreenForTabOrPending()); | |
| 385 } | |
| 386 | |
| 387 #if defined(OS_MACOSX) | |
| 388 // http://crbug.com/100467 | |
| 389 IN_PROC_BROWSER_TEST_F( | |
| 390 FullscreenControllerTest, FAILS_TabEntersPresentationModeFromWindowed) { | |
| 391 ASSERT_TRUE(test_server()->Start()); | |
| 392 | |
| 393 AddTabAtIndexAndWait( | |
| 394 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | |
| 395 | |
| 396 WebContents* tab = chrome::GetActiveWebContents(browser()); | |
| 397 | |
| 398 { | |
| 399 FullscreenNotificationObserver fullscreen_observer; | |
| 400 EXPECT_FALSE(browser()->window()->IsFullscreen()); | |
| 401 EXPECT_FALSE(browser()->window()->InPresentationMode()); | |
| 402 browser()->ToggleFullscreenModeForTab(tab, true); | |
| 403 fullscreen_observer.Wait(); | |
| 404 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 405 ASSERT_TRUE(browser()->window()->InPresentationMode()); | |
| 406 } | |
| 407 | |
| 408 { | |
| 409 FullscreenNotificationObserver fullscreen_observer; | |
| 410 browser()->TogglePresentationMode(); | |
| 411 fullscreen_observer.Wait(); | |
| 412 ASSERT_FALSE(browser()->window()->IsFullscreen()); | |
| 413 ASSERT_FALSE(browser()->window()->InPresentationMode()); | |
| 414 } | |
| 415 | |
| 416 if (base::mac::IsOSLionOrLater()) { | |
| 417 // Test that tab fullscreen mode doesn't make presentation mode the default | |
| 418 // on Lion. | |
| 419 FullscreenNotificationObserver fullscreen_observer; | |
| 420 chrome::ToggleFullscreenMode(browser()); | |
| 421 fullscreen_observer.Wait(); | |
| 422 ASSERT_TRUE(browser()->window()->IsFullscreen()); | |
| 423 ASSERT_FALSE(browser()->window()->InPresentationMode()); | |
| 424 } | |
| 425 } | |
| 426 #endif | |
| 427 | |
| 428 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | 27 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, |
| 429 PendingMouseLockExitsOnTabSwitch) { | 28 PendingMouseLockExitsOnTabSwitch) { |
| 430 AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), | 29 AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), |
| 431 content::PAGE_TRANSITION_TYPED); | 30 content::PAGE_TRANSITION_TYPED); |
| 432 AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), | 31 AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), |
| 433 content::PAGE_TRANSITION_TYPED); | 32 content::PAGE_TRANSITION_TYPED); |
| 434 WebContents* tab1 = chrome::GetActiveWebContents(browser()); | 33 WebContents* tab1 = chrome::GetActiveWebContents(browser()); |
| 435 | 34 |
| 436 // Request mouse lock. Bubble is displayed. | 35 // Request mouse lock. Bubble is displayed. |
| 437 RequestToLockMouse(true, false); | 36 RequestToLockMouse(true, false); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 72 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 474 | 73 |
| 475 // Close tab. Bubble is cleared. | 74 // Close tab. Bubble is cleared. |
| 476 { | 75 { |
| 477 MouseLockNotificationObserver mouse_lock_observer; | 76 MouseLockNotificationObserver mouse_lock_observer; |
| 478 chrome::CloseTab(browser()); | 77 chrome::CloseTab(browser()); |
| 479 mouse_lock_observer.Wait(); | 78 mouse_lock_observer.Wait(); |
| 480 } | 79 } |
| 481 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 80 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 482 } | 81 } |
| OLD | NEW |