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

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 2 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, 753 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
754 content::NotificationService::AllSources())); 754 content::NotificationService::AllSources()));
755 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); 755 ASSERT_TRUE(IsFullscreenBubbleDisplayed());
756 ASSERT_TRUE(IsMouseLockPermissionRequested()); 756 ASSERT_TRUE(IsMouseLockPermissionRequested());
757 ASSERT_FALSE(IsMouseLocked()); 757 ASSERT_FALSE(IsMouseLocked());
758 758
759 // Accept mouse lock. 759 // Accept mouse lock.
760 AcceptCurrentFullscreenOrMouseLockRequest(); 760 AcceptCurrentFullscreenOrMouseLockRequest();
761 ASSERT_TRUE(IsMouseLocked()); 761 ASSERT_TRUE(IsMouseLocked());
762 762
763 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); 763 ui_test_utils::NavigateToURL(browser(), GURL("chrome://omnibox"));
764 764
765 ASSERT_FALSE(IsMouseLocked()); 765 ASSERT_FALSE(IsMouseLocked());
766 } 766 }
767 767
768 // Tests mouse lock is exited when navigating back. 768 // Tests mouse lock is exited when navigating back.
769 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, 769 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
770 MAYBE_TestTabExitsMouseLockOnGoBack) { 770 MAYBE_TestTabExitsMouseLockOnGoBack) {
771 ASSERT_TRUE(test_server()->Start()); 771 ASSERT_TRUE(test_server()->Start());
772 772
773 // Navigate twice to provide a place to go back to. 773 // Navigate twice to provide a place to go back to.
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 906
907 GURL url = test_server()->GetURL("simple.html"); 907 GURL url = test_server()->GetURL("simple.html");
908 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); 908 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);
909 909
910 // Validate that going fullscreen for a URL defaults to asking permision. 910 // Validate that going fullscreen for a URL defaults to asking permision.
911 ASSERT_FALSE(IsFullscreenPermissionRequested()); 911 ASSERT_FALSE(IsFullscreenPermissionRequested());
912 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); 912 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true));
913 ASSERT_TRUE(IsFullscreenPermissionRequested()); 913 ASSERT_TRUE(IsFullscreenPermissionRequested());
914 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); 914 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false));
915 } 915 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698