| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 #include "chrome/browser/content_settings/host_content_settings_map.h" | 6 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 7 #include "chrome/browser/fullscreen.h" | 7 #include "chrome/browser/fullscreen.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| (...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 797 | 797 |
| 798 // Accept mouse lock. | 798 // Accept mouse lock. |
| 799 AcceptCurrentFullscreenOrMouseLockRequest(); | 799 AcceptCurrentFullscreenOrMouseLockRequest(); |
| 800 ASSERT_TRUE(IsMouseLocked()); | 800 ASSERT_TRUE(IsMouseLocked()); |
| 801 | 801 |
| 802 GoBack(); | 802 GoBack(); |
| 803 | 803 |
| 804 ASSERT_FALSE(IsMouseLocked()); | 804 ASSERT_FALSE(IsMouseLocked()); |
| 805 } | 805 } |
| 806 | 806 |
| 807 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 808 // TODO(erg): linux_aura bringup: http://crbug.com/163931 |
| 809 #define MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation DISABLED_TestTabDoe
sntExitMouseLockOnSubFrameNavigation |
| 810 #else |
| 811 #define MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation TestTabDoesntExitMo
useLockOnSubFrameNavigation |
| 812 #endif |
| 813 |
| 807 // Tests mouse lock is not exited on sub frame navigation. | 814 // Tests mouse lock is not exited on sub frame navigation. |
| 808 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 815 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 809 TestTabDoesntExitMouseLockOnSubFrameNavigation) { | 816 MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation) { |
| 810 ASSERT_TRUE(test_server()->Start()); | 817 ASSERT_TRUE(test_server()->Start()); |
| 811 | 818 |
| 812 // Create URLs for test page and test page with #fragment. | 819 // Create URLs for test page and test page with #fragment. |
| 813 GURL url(test_server()->GetURL(kFullscreenMouseLockHTML)); | 820 GURL url(test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 814 GURL url_with_fragment(url.spec() + "#fragment"); | 821 GURL url_with_fragment(url.spec() + "#fragment"); |
| 815 | 822 |
| 816 // Navigate to test page. | 823 // Navigate to test page. |
| 817 ui_test_utils::NavigateToURL(browser(), url); | 824 ui_test_utils::NavigateToURL(browser(), url); |
| 818 | 825 |
| 819 // Lock the mouse with a user gesture. | 826 // Lock the mouse with a user gesture. |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 917 | 924 |
| 918 GURL url = test_server()->GetURL("simple.html"); | 925 GURL url = test_server()->GetURL("simple.html"); |
| 919 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); | 926 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); |
| 920 | 927 |
| 921 // Validate that going fullscreen for a URL defaults to asking permision. | 928 // Validate that going fullscreen for a URL defaults to asking permision. |
| 922 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 929 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 923 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); | 930 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); |
| 924 ASSERT_TRUE(IsFullscreenPermissionRequested()); | 931 ASSERT_TRUE(IsFullscreenPermissionRequested()); |
| 925 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); | 932 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); |
| 926 } | 933 } |
| OLD | NEW |