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/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
10 #include "chrome/browser/ui/browser_tabstrip.h" | 10 #include "chrome/browser/ui/browser_tabstrip.h" |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 | 359 |
360 GoBack(); | 360 GoBack(); |
361 | 361 |
362 ASSERT_TRUE(IsFullscreenForBrowser()); | 362 ASSERT_TRUE(IsFullscreenForBrowser()); |
363 ASSERT_FALSE(IsFullscreenForTabOrPending()); | 363 ASSERT_FALSE(IsFullscreenForTabOrPending()); |
364 } | 364 } |
365 | 365 |
366 #if defined(OS_MACOSX) | 366 #if defined(OS_MACOSX) |
367 // http://crbug.com/100467 | 367 // http://crbug.com/100467 |
368 IN_PROC_BROWSER_TEST_F( | 368 IN_PROC_BROWSER_TEST_F( |
369 FullscreenControllerTest, FAILS_TabEntersPresentationModeFromWindowed) { | 369 FullscreenControllerTest, DISABLED_TabEntersPresentationModeFromWindowed) { |
370 ASSERT_TRUE(test_server()->Start()); | 370 ASSERT_TRUE(test_server()->Start()); |
371 | 371 |
372 AddTabAtIndexAndWait( | 372 AddTabAtIndexAndWait( |
373 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 373 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
374 | 374 |
375 WebContents* tab = chrome::GetActiveWebContents(browser()); | 375 WebContents* tab = chrome::GetActiveWebContents(browser()); |
376 | 376 |
377 { | 377 { |
378 FullscreenNotificationObserver fullscreen_observer; | 378 FullscreenNotificationObserver fullscreen_observer; |
379 EXPECT_FALSE(browser()->window()->IsFullscreen()); | 379 EXPECT_FALSE(browser()->window()->IsFullscreen()); |
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
864 | 864 |
865 GURL url = test_server()->GetURL("simple.html"); | 865 GURL url = test_server()->GetURL("simple.html"); |
866 AddTabAtIndexAndWait(0, url, content::PAGE_TRANSITION_TYPED); | 866 AddTabAtIndexAndWait(0, url, content::PAGE_TRANSITION_TYPED); |
867 | 867 |
868 // Validate that going fullscreen for a URL defaults to asking permision. | 868 // Validate that going fullscreen for a URL defaults to asking permision. |
869 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 869 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
870 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); | 870 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); |
871 ASSERT_TRUE(IsFullscreenPermissionRequested()); | 871 ASSERT_TRUE(IsFullscreenPermissionRequested()); |
872 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); | 872 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); |
873 } | 873 } |
OLD | NEW |