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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 2802783002: List all a11y features in a11y detailed view in ash system menu (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/accessibility/accessibility_manager.h ('K') | « chrome/browser/chromeos/accessibility/accessibility_manager.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index 2350790ddfcd6d018f377ecb4bfd1287e9330b59..e7768488c8dfc71cab66e2f2e8b807b24f3a946e 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -220,6 +220,18 @@ class TrayAccessibilityTest
tray()->detailed_menu_->OnViewClicked(button);
}
+ void ClickStickyKeysOnDetailMenu() {
+ views::View* button = tray()->detailed_menu_->sticky_keys_view_;
+ ASSERT_TRUE(button);
+ tray()->detailed_menu_->OnViewClicked(button);
+ }
+
+ void ClickTapDraggingOnDetailMenu() {
+ views::View* button = tray()->detailed_menu_->tap_dragging_view_;
+ ASSERT_TRUE(button);
+ tray()->detailed_menu_->OnViewClicked(button);
+ }
+
bool IsSpokenFeedbackEnabledOnDetailMenu() const {
return tray()->detailed_menu_->spoken_feedback_enabled_;
}
@@ -260,6 +272,14 @@ class TrayAccessibilityTest
return tray()->detailed_menu_->highlight_keyboard_focus_enabled_;
}
+ bool IsStickyKeysEnabledOnDetailMenu() const {
+ return tray()->detailed_menu_->sticky_keys_enabled_;
+ }
+
+ bool IsTapDraggingEnabledOnDetailMenu() const {
+ return tray()->detailed_menu_->tap_dragging_enabled_;
+ }
+
bool IsSpokenFeedbackMenuShownOnDetailMenu() const {
return tray()->detailed_menu_->spoken_feedback_view_;
}
@@ -300,6 +320,14 @@ class TrayAccessibilityTest
return tray()->detailed_menu_->highlight_keyboard_focus_view_;
}
+ bool IsStickyKeysMenuShownOnDetailMenu() const {
+ return tray()->detailed_menu_->sticky_keys_view_;
+ }
+
+ bool IsTapDraggingMenuShownOnDetailMenu() const {
+ return tray()->detailed_menu_->tap_dragging_view_;
+ }
+
// In material design we show the help button but theme it as disabled if
// it is not possible to load the help page.
bool IsHelpAvailableOnDetailMenu() const {
@@ -422,6 +450,18 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
EXPECT_FALSE(IsTrayIconVisible());
+ // Toggling the sticky keys changes the visibility of the icon.
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(IsTrayIconVisible());
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_FALSE(IsTrayIconVisible());
+
+ // Toggling the tap dragging changes the visibility of the icon.
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(IsTrayIconVisible());
+ AccessibilityManager::Get()->EnableTapDragging(false);
+ EXPECT_FALSE(IsTrayIconVisible());
+
// Enabling all accessibility features.
SetMagnifierEnabled(true);
EXPECT_TRUE(IsTrayIconVisible());
@@ -442,6 +482,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {
EXPECT_TRUE(IsTrayIconVisible());
AccessibilityManager::Get()->SetFocusHighlightEnabled(true);
EXPECT_TRUE(IsTrayIconVisible());
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(IsTrayIconVisible());
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(IsTrayIconVisible());
AccessibilityManager::Get()->EnableSpokenFeedback(
false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(IsTrayIconVisible());
@@ -460,6 +504,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {
AccessibilityManager::Get()->SetCursorHighlightEnabled(false);
EXPECT_TRUE(IsTrayIconVisible());
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
+ EXPECT_TRUE(IsTrayIconVisible());
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_TRUE(IsTrayIconVisible());
+ AccessibilityManager::Get()->EnableTapDragging(false);
EXPECT_FALSE(IsTrayIconVisible());
// Confirms that prefs::kShouldAlwaysShowAccessibilityMenu doesn't affect
@@ -544,6 +592,18 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
EXPECT_FALSE(CanCreateMenuItem());
+ // Toggling sticky keys changes the visibility of the menu.
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_FALSE(CanCreateMenuItem());
+
+ // Toggling tap dragging changes the visibility of the menu.
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(false);
+ EXPECT_FALSE(CanCreateMenuItem());
+
// Enabling all accessibility features.
SetMagnifierEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
@@ -566,6 +626,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetFocusHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableVirtualKeyboard(false);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableAutoclick(false);
@@ -586,6 +650,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {
AccessibilityManager::Get()->SetCursorHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(false);
EXPECT_FALSE(CanCreateMenuItem());
}
@@ -632,36 +700,48 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {
AccessibilityManager::Get()->EnableVirtualKeyboard(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling large mouse cursor.
+ // The menu remains visible regardless of toggling large mouse cursor.
AccessibilityManager::Get()->EnableLargeCursor(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableLargeCursor(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling mono audio.
+ // The menu remains visible regardless of toggling mono audio.
AccessibilityManager::Get()->EnableMonoAudio(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableMonoAudio(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling caret highlight.
+ // The menu remains visible regardless of toggling caret highlight.
AccessibilityManager::Get()->SetCaretHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetCaretHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling highlight mouse cursor.
+ // The menu remains visible regardless of toggling highlight mouse cursor.
AccessibilityManager::Get()->SetCursorHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetCursorHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling highlight keyboard focus.
+ // The menu remains visible regardless of toggling highlight keyboard focus.
AccessibilityManager::Get()->SetFocusHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
+ // The menu remains visible regardless of the toggling sticky keys.
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_TRUE(CanCreateMenuItem());
+
+ // The menu remains visible regardless of the toggling tap dragging.
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(false);
+ EXPECT_TRUE(CanCreateMenuItem());
+
// Enabling all accessibility features.
SetMagnifierEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
@@ -684,6 +764,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetFocusHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableVirtualKeyboard(false);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableAutoclick(false);
@@ -705,6 +789,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(false);
+ EXPECT_TRUE(CanCreateMenuItem());
SetShowAccessibilityOptionsInSystemTrayMenu(false);
@@ -744,36 +832,48 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) {
AccessibilityManager::Get()->EnableVirtualKeyboard(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling large mouse cursor.
+ // The menu remains visible regardless of toggling large mouse cursor.
AccessibilityManager::Get()->EnableLargeCursor(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableLargeCursor(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling mono audio.
+ // The menu remains visible regardless of toggling mono audio.
AccessibilityManager::Get()->EnableMonoAudio(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableMonoAudio(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling caret highlight.
+ // The menu remains visible regardless of toggling caret highlight.
AccessibilityManager::Get()->SetCaretHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetCaretHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling highlight mouse cursor.
+ // The menu remains visible regardless of toggling highlight mouse cursor.
AccessibilityManager::Get()->SetCursorHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetCursorHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
- // The menu remains visibile regardless of toggling highlight keyboard focus.
+ // The menu remains visible regardless of toggling highlight keyboard focus.
AccessibilityManager::Get()->SetFocusHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
+ // The menu remains visible regardless of toggling sticky keys.
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_TRUE(CanCreateMenuItem());
+
+ // The menu remains visible regardless of toggling tap dragging.
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(false);
+ EXPECT_TRUE(CanCreateMenuItem());
+
// Enabling all accessibility features.
SetMagnifierEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
@@ -794,6 +894,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) {
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetFocusHighlightEnabled(true);
EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableVirtualKeyboard(false);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
@@ -813,6 +917,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) {
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_TRUE(CanCreateMenuItem());
+ AccessibilityManager::Get()->EnableTapDragging(false);
+ EXPECT_TRUE(CanCreateMenuItem());
SetShowAccessibilityOptionsInSystemTrayMenu(true);
@@ -991,6 +1099,28 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ClickDetailMenu) {
EXPECT_TRUE(CreateDetailedMenu());
ClickHighlishtKeyboardFocusOnDetailMenu();
EXPECT_FALSE(AccessibilityManager::Get()->IsFocusHighlightEnabled());
+
+ // Confirms that the check item toggles sticky keys.
+ EXPECT_FALSE(AccessibilityManager::Get()->IsStickyKeysEnabled());
+
+ EXPECT_TRUE(CreateDetailedMenu());
+ ClickStickyKeysOnDetailMenu();
+ EXPECT_TRUE(AccessibilityManager::Get()->IsStickyKeysEnabled());
+
+ EXPECT_TRUE(CreateDetailedMenu());
+ ClickStickyKeysOnDetailMenu();
+ EXPECT_FALSE(AccessibilityManager::Get()->IsStickyKeysEnabled());
+
+ // Confirms that the check item toggles tap dragging.
+ EXPECT_FALSE(AccessibilityManager::Get()->IsTapDraggingEnabled());
+
+ EXPECT_TRUE(CreateDetailedMenu());
+ ClickTapDraggingOnDetailMenu();
+ EXPECT_TRUE(AccessibilityManager::Get()->IsTapDraggingEnabled());
+
+ EXPECT_TRUE(CreateDetailedMenu());
+ ClickTapDraggingOnDetailMenu();
+ EXPECT_FALSE(AccessibilityManager::Get()->IsTapDraggingEnabled());
}
IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
@@ -1008,6 +1138,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling spoken feedback.
@@ -1024,6 +1156,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling spoken feedback.
@@ -1040,6 +1174,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling high contrast.
@@ -1055,6 +1191,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling high contrast.
@@ -1070,6 +1208,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling full screen magnifier.
@@ -1085,6 +1225,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling screen magnifier.
@@ -1100,6 +1242,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling large cursor.
@@ -1115,6 +1259,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling large cursor.
@@ -1130,6 +1276,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enable on-screen keyboard.
@@ -1145,6 +1293,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disable on-screen keyboard.
@@ -1160,6 +1310,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling mono audio.
@@ -1175,6 +1327,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling mono audio.
@@ -1190,6 +1344,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling caret highlight.
@@ -1205,6 +1361,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_TRUE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling caret highlight.
@@ -1220,6 +1378,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling highlight mouse cursor.
@@ -1235,6 +1395,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_TRUE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling highlight mouse cursor.
@@ -1250,6 +1412,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling highlight keyboard focus.
@@ -1265,6 +1429,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_TRUE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling highlight keyboard focus.
@@ -1280,6 +1446,76 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
+ CloseDetailMenu();
+
+ // Enabling sticky keys.
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ EXPECT_TRUE(CreateDetailedMenu());
+ EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
+ EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
+ EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu());
+ EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu());
+ EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu());
+ EXPECT_FALSE(IsMonoAudioEnabledOnDetailMenu());
+ EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_TRUE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
+ CloseDetailMenu();
+
+ // Disabling sticky keys.
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ EXPECT_TRUE(CreateDetailedMenu());
+ EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
+ EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
+ EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu());
+ EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu());
+ EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu());
+ EXPECT_FALSE(IsMonoAudioEnabledOnDetailMenu());
+ EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
+ CloseDetailMenu();
+
+ // Enabling tap dragging.
+ AccessibilityManager::Get()->EnableTapDragging(true);
+ EXPECT_TRUE(CreateDetailedMenu());
+ EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
+ EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
+ EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu());
+ EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu());
+ EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu());
+ EXPECT_FALSE(IsMonoAudioEnabledOnDetailMenu());
+ EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_TRUE(IsTapDraggingEnabledOnDetailMenu());
+ CloseDetailMenu();
+
+ // Disabling tap dragging.
+ AccessibilityManager::Get()->EnableTapDragging(false);
+ EXPECT_TRUE(CreateDetailedMenu());
+ EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
+ EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
+ EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu());
+ EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu());
+ EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu());
+ EXPECT_FALSE(IsMonoAudioEnabledOnDetailMenu());
+ EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
+ EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling all of the a11y features.
@@ -1294,6 +1530,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
AccessibilityManager::Get()->SetCaretHighlightEnabled(true);
AccessibilityManager::Get()->SetCursorHighlightEnabled(true);
AccessibilityManager::Get()->SetFocusHighlightEnabled(true);
+ AccessibilityManager::Get()->EnableStickyKeys(true);
+ AccessibilityManager::Get()->EnableTapDragging(true);
EXPECT_TRUE(CreateDetailedMenu());
EXPECT_TRUE(IsSpokenFeedbackEnabledOnDetailMenu());
EXPECT_TRUE(IsHighContrastEnabledOnDetailMenu());
@@ -1306,6 +1544,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_TRUE(IsHighlightMouseCursorEnabledOnDetailMenu());
// Focus highlighting can't be on when spoken feedback is on
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_TRUE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_TRUE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling all of the a11y features.
@@ -1320,6 +1560,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
AccessibilityManager::Get()->SetCaretHighlightEnabled(false);
AccessibilityManager::Get()->SetCursorHighlightEnabled(false);
AccessibilityManager::Get()->SetFocusHighlightEnabled(false);
+ AccessibilityManager::Get()->EnableStickyKeys(false);
+ AccessibilityManager::Get()->EnableTapDragging(false);
EXPECT_TRUE(CreateDetailedMenu());
EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
@@ -1331,6 +1573,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Enabling autoclick.
@@ -1346,6 +1590,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
// Disabling autoclick.
@@ -1361,6 +1607,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
EXPECT_FALSE(IsCaretHighlightEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightMouseCursorEnabledOnDetailMenu());
EXPECT_FALSE(IsHighlightKeyboardFocusEnabledOnDetailMenu());
+ EXPECT_FALSE(IsStickyKeysEnabledOnDetailMenu());
+ EXPECT_FALSE(IsTapDraggingEnabledOnDetailMenu());
CloseDetailMenu();
}
@@ -1381,6 +1629,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
+ EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu());
+ EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
CloseDetailMenu();
SetLoginStatus(ash::LoginStatus::USER);
@@ -1397,6 +1647,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
+ EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu());
+ EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
CloseDetailMenu();
SetLoginStatus(ash::LoginStatus::LOCKED);
@@ -1413,6 +1665,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
+ EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu());
+ EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
CloseDetailMenu();
session_manager::SessionManager::Get()->SetSessionState(
@@ -1432,6 +1686,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
EXPECT_TRUE(IsCaretHighlightMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighlightMouseCursorMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighlightKeyboardFocusMenuShownOnDetailMenu());
+ EXPECT_TRUE(IsStickyKeysMenuShownOnDetailMenu());
+ EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
CloseDetailMenu();
}
« chrome/browser/chromeos/accessibility/accessibility_manager.h ('K') | « chrome/browser/chromeos/accessibility/accessibility_manager.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698