| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <map> | 5 #include <map> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "apps/app_window_registry.h" | 8 #include "apps/app_window_registry.h" |
| 9 #include "apps/ui/native_app_window.h" | 9 #include "apps/ui/native_app_window.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 ASSERT_TRUE(browser); | 661 ASSERT_TRUE(browser); |
| 662 BrowserWindow* browser_window = browser->window(); | 662 BrowserWindow* browser_window = browser->window(); |
| 663 ASSERT_TRUE(browser_window); | 663 ASSERT_TRUE(browser_window); |
| 664 | 664 |
| 665 // Verify that an attempt to enter fullscreen mode is denied. | 665 // Verify that an attempt to enter fullscreen mode is denied. |
| 666 EXPECT_FALSE(browser_window->IsFullscreen()); | 666 EXPECT_FALSE(browser_window->IsFullscreen()); |
| 667 chrome::ToggleFullscreenMode(browser); | 667 chrome::ToggleFullscreenMode(browser); |
| 668 EXPECT_FALSE(browser_window->IsFullscreen()); | 668 EXPECT_FALSE(browser_window->IsFullscreen()); |
| 669 } | 669 } |
| 670 | 670 |
| 671 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsUncached) { | 671 // http://crbug.com/393208 |
| 672 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_ExtensionsUncached) { |
| 672 // Make it possible to force-install a hosted app and an extension. | 673 // Make it possible to force-install a hosted app and an extension. |
| 673 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 674 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| 674 TestingUpdateManifestProvider testing_update_manifest_provider( | 675 TestingUpdateManifestProvider testing_update_manifest_provider( |
| 675 kRelativeUpdateURL); | 676 kRelativeUpdateURL); |
| 676 testing_update_manifest_provider.AddUpdate( | 677 testing_update_manifest_provider.AddUpdate( |
| 677 kHostedAppID, | 678 kHostedAppID, |
| 678 kHostedAppVersion, | 679 kHostedAppVersion, |
| 679 embedded_test_server()->GetURL(std::string("/") + kHostedAppCRXPath)); | 680 embedded_test_server()->GetURL(std::string("/") + kHostedAppCRXPath)); |
| 680 testing_update_manifest_provider.AddUpdate( | 681 testing_update_manifest_provider.AddUpdate( |
| 681 kGoodExtensionID, | 682 kGoodExtensionID, |
| (...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1384 if (!IsSessionStarted()) { | 1385 if (!IsSessionStarted()) { |
| 1385 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED, | 1386 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED, |
| 1386 base::Bind(IsSessionStarted)).Wait(); | 1387 base::Bind(IsSessionStarted)).Wait(); |
| 1387 } | 1388 } |
| 1388 } | 1389 } |
| 1389 | 1390 |
| 1390 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance, | 1391 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance, |
| 1391 TermsOfServiceTest, testing::Bool()); | 1392 TermsOfServiceTest, testing::Bool()); |
| 1392 | 1393 |
| 1393 } // namespace policy | 1394 } // namespace policy |
| OLD | NEW |