| 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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 fullscreen_observer.Wait(); | 648 fullscreen_observer.Wait(); |
| 649 | 649 |
| 650 // Confirm they are enabled and there is no prompt. | 650 // Confirm they are enabled and there is no prompt. |
| 651 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 651 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 652 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 652 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 653 ASSERT_FALSE(IsMouseLockPermissionRequested()); | 653 ASSERT_FALSE(IsMouseLockPermissionRequested()); |
| 654 ASSERT_TRUE(IsMouseLocked()); | 654 ASSERT_TRUE(IsMouseLocked()); |
| 655 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); | 655 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); |
| 656 } | 656 } |
| 657 | 657 |
| 658 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) | |
| 659 // TODO(erg): linux_aura bringup: http://crbug.com/163931 | 658 // TODO(erg): linux_aura bringup: http://crbug.com/163931 |
| 659 // Flaky on Windows: http://crbug.com/159000 |
| 660 #if defined(OS_WIN) || \ |
| 661 (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)) |
| 660 #define MAYBE_MouseLockSilentAfterTargetUnlock \ | 662 #define MAYBE_MouseLockSilentAfterTargetUnlock \ |
| 661 DISABLED_MouseLockSilentAfterTargetUnlock | 663 DISABLED_MouseLockSilentAfterTargetUnlock |
| 662 #else | 664 #else |
| 663 #define MAYBE_MouseLockSilentAfterTargetUnlock MouseLockSilentAfterTargetUnlock | 665 #define MAYBE_MouseLockSilentAfterTargetUnlock MouseLockSilentAfterTargetUnlock |
| 664 #endif | 666 #endif |
| 665 | 667 |
| 666 // Tests mouse lock can be exited and re-entered by an application silently | 668 // Tests mouse lock can be exited and re-entered by an application silently |
| 667 // with no UI distraction for users. | 669 // with no UI distraction for users. |
| 668 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 670 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 669 MAYBE_MouseLockSilentAfterTargetUnlock) { | 671 MAYBE_MouseLockSilentAfterTargetUnlock) { |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 | 926 |
| 925 GURL url = test_server()->GetURL("simple.html"); | 927 GURL url = test_server()->GetURL("simple.html"); |
| 926 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); | 928 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); |
| 927 | 929 |
| 928 // Validate that going fullscreen for a URL defaults to asking permision. | 930 // Validate that going fullscreen for a URL defaults to asking permision. |
| 929 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 931 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 930 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); | 932 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); |
| 931 ASSERT_TRUE(IsFullscreenPermissionRequested()); | 933 ASSERT_TRUE(IsFullscreenPermissionRequested()); |
| 932 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); | 934 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); |
| 933 } | 935 } |
| OLD | NEW |