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

Side by Side Diff: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 2821363002: cros: Disable system tray help/lock buttons during supervised user creation (Closed)
Patch Set: fix browser test Created 3 years, 8 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
« no previous file with comments | « ash/test/test_session_controller_client.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/accessibility_types.h" 5 #include "ash/accessibility_types.h"
6 #include "ash/login_status.h" 6 #include "ash/login_status.h"
7 #include "ash/magnifier/magnification_controller.h" 7 #include "ash/magnifier/magnification_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/tray/system_tray.h" 9 #include "ash/system/tray/system_tray.h"
10 #include "ash/system/tray_accessibility.h" 10 #include "ash/system/tray_accessibility.h"
(...skipping 1623 matching lines...) Expand 10 before | Expand all | Expand 10 after
1634 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu()); 1634 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
1635 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu()); 1635 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu());
1636 EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu()); 1636 EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu());
1637 EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu()); 1637 EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
1638 EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu()); 1638 EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
1639 EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu()); 1639 EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
1640 EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu()); 1640 EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu());
1641 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu()); 1641 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
1642 CloseDetailMenu(); 1642 CloseDetailMenu();
1643 1643
1644 SetLoginStatus(ash::LoginStatus::USER); 1644 // Simulate login.
1645 session_manager::SessionManager::Get()->CreateSession(
1646 AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain");
1647 session_manager::SessionManager::Get()->SessionStarted();
1648 // Flush to ensure the session state reaches ash and updates login status.
1649 SessionControllerClient::FlushForTesting();
1645 EXPECT_TRUE(CreateDetailedMenu()); 1650 EXPECT_TRUE(CreateDetailedMenu());
1646 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); 1651 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
1647 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); 1652 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
1648 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); 1653 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
1649 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); 1654 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
1650 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); 1655 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
1651 EXPECT_TRUE(IsHelpAvailableOnDetailMenu()); 1656 EXPECT_TRUE(IsHelpAvailableOnDetailMenu());
1652 EXPECT_TRUE(IsSettingsAvailableOnDetailMenu()); 1657 EXPECT_TRUE(IsSettingsAvailableOnDetailMenu());
1653 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu()); 1658 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu());
1654 EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu()); 1659 EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu());
1655 EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu()); 1660 EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
1656 EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu()); 1661 EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
1657 EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu()); 1662 EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
1658 EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu()); 1663 EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu());
1659 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu()); 1664 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
1660 CloseDetailMenu(); 1665 CloseDetailMenu();
1661 1666
1662 SetLoginStatus(ash::LoginStatus::LOCKED); 1667 // Simulate screen lock.
1668 session_manager::SessionManager::Get()->SetSessionState(
1669 session_manager::SessionState::LOCKED);
1670 // Flush to ensure the session state reaches ash and updates login status.
1671 SessionControllerClient::FlushForTesting();
1663 EXPECT_TRUE(CreateDetailedMenu()); 1672 EXPECT_TRUE(CreateDetailedMenu());
1664 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); 1673 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
1665 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); 1674 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
1666 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); 1675 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
1667 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); 1676 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
1668 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); 1677 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
1669 EXPECT_FALSE(IsHelpAvailableOnDetailMenu()); 1678 EXPECT_FALSE(IsHelpAvailableOnDetailMenu());
1670 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu()); 1679 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
1671 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu()); 1680 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu());
1672 EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu()); 1681 EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu());
1673 EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu()); 1682 EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
1674 EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu()); 1683 EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
1675 EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu()); 1684 EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
1676 EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu()); 1685 EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu());
1677 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu()); 1686 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
1678 CloseDetailMenu(); 1687 CloseDetailMenu();
1679 1688
1689 // Simulate adding multiprofile user.
1680 session_manager::SessionManager::Get()->SetSessionState( 1690 session_manager::SessionManager::Get()->SetSessionState(
1681 session_manager::SessionState::LOGIN_SECONDARY); 1691 session_manager::SessionState::LOGIN_SECONDARY);
1682 // Flush to ensure the session state reaches ash and updates login status. 1692 // Flush to ensure the session state reaches ash and updates login status.
1683 SessionControllerClient::FlushForTesting(); 1693 SessionControllerClient::FlushForTesting();
1684 SetLoginStatus(ash::LoginStatus::USER);
1685 EXPECT_TRUE(CreateDetailedMenu()); 1694 EXPECT_TRUE(CreateDetailedMenu());
1686 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); 1695 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
1687 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); 1696 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
1688 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); 1697 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
1689 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); 1698 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
1690 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); 1699 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
1691 EXPECT_FALSE(IsHelpAvailableOnDetailMenu()); 1700 EXPECT_FALSE(IsHelpAvailableOnDetailMenu());
1692 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu()); 1701 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
1693 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu()); 1702 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu());
1694 EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu()); 1703 EXPECT_TRUE(IsMonoAudioMenuShownOnDetailMenu());
1695 EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu()); 1704 EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
1696 EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu()); 1705 EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
1697 EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu()); 1706 EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
1698 EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu()); 1707 EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu());
1699 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu()); 1708 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
1700 CloseDetailMenu(); 1709 CloseDetailMenu();
1701 } 1710 }
1702 1711
1703 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, 1712 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
1704 TrayAccessibilityTest, 1713 TrayAccessibilityTest,
1705 testing::Values(PREF_SERVICE, 1714 testing::Values(PREF_SERVICE,
1706 POLICY)); 1715 POLICY));
1707 1716
1708 } // namespace chromeos 1717 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/test/test_session_controller_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698