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

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

Issue 2343603003: [Chrome OS MD] Implement accessibility detailed view for the MD Ash system menu (Closed)
Patch Set: ' Created 4 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
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/common/accessibility_types.h" 5 #include "ash/common/accessibility_types.h"
6 #include "ash/common/login_status.h" 6 #include "ash/common/login_status.h"
7 #include "ash/common/material_design/material_design_controller.h"
7 #include "ash/common/system/tray/system_tray.h" 8 #include "ash/common/system/tray/system_tray.h"
8 #include "ash/common/system/tray_accessibility.h" 9 #include "ash/common/system/tray_accessibility.h"
9 #include "ash/magnifier/magnification_controller.h" 10 #include "ash/magnifier/magnification_controller.h"
10 #include "ash/shell.h" 11 #include "ash/shell.h"
11 #include "ash/test/shell_test_api.h" 12 #include "ash/test/shell_test_api.h"
12 #include "ash/test/test_session_state_delegate.h" 13 #include "ash/test/test_session_state_delegate.h"
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/command_line.h" 15 #include "base/command_line.h"
15 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 CloseDetailMenu(); 863 CloseDetailMenu();
863 864
864 SetLoginStatus(ash::LoginStatus::USER); 865 SetLoginStatus(ash::LoginStatus::USER);
865 EXPECT_TRUE(CreateDetailedMenu()); 866 EXPECT_TRUE(CreateDetailedMenu());
866 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); 867 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
867 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); 868 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
868 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); 869 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
869 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu()); 870 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
870 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); 871 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
871 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); 872 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
872 EXPECT_TRUE(IsHelpShownOnDetailMenu()); 873 if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
873 EXPECT_TRUE(IsSettingsShownOnDetailMenu()); 874 EXPECT_FALSE(IsHelpShownOnDetailMenu());
875 EXPECT_FALSE(IsSettingsShownOnDetailMenu());
876 } else {
877 EXPECT_TRUE(IsHelpShownOnDetailMenu());
878 EXPECT_TRUE(IsSettingsShownOnDetailMenu());
879 }
874 CloseDetailMenu(); 880 CloseDetailMenu();
875 881
876 SetLoginStatus(ash::LoginStatus::LOCKED); 882 SetLoginStatus(ash::LoginStatus::LOCKED);
877 EXPECT_TRUE(CreateDetailedMenu()); 883 EXPECT_TRUE(CreateDetailedMenu());
878 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); 884 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
879 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); 885 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
880 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); 886 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
881 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu()); 887 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
882 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); 888 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
883 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); 889 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
(...skipping 18 matching lines...) Expand all
902 EXPECT_FALSE(IsSettingsShownOnDetailMenu()); 908 EXPECT_FALSE(IsSettingsShownOnDetailMenu());
903 CloseDetailMenu(); 909 CloseDetailMenu();
904 } 910 }
905 911
906 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, 912 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
907 TrayAccessibilityTest, 913 TrayAccessibilityTest,
908 testing::Values(PREF_SERVICE, 914 testing::Values(PREF_SERVICE,
909 POLICY)); 915 POLICY));
910 916
911 } // namespace chromeos 917 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/resources/vector_icons/system_menu_accessibility_screen_magnifier.1x.icon ('k') | ui/gfx/vector_icons/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698