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

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

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/system/tray/system_tray.h" 7 #include "ash/common/system/tray/system_tray.h"
8 #include "ash/common/system/tray_accessibility.h" 8 #include "ash/common/system/tray_accessibility.h"
9 #include "ash/common/test/test_session_state_delegate.h"
10 #include "ash/magnifier/magnification_controller.h" 9 #include "ash/magnifier/magnification_controller.h"
11 #include "ash/shell.h" 10 #include "ash/shell.h"
12 #include "ash/test/shell_test_api.h" 11 #include "ash/test/shell_test_api.h"
13 #include "base/callback.h" 12 #include "base/callback.h"
14 #include "base/command_line.h" 13 #include "base/command_line.h"
15 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
16 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
17 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 18 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); 882 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
884 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); 883 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
885 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); 884 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
886 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu()); 885 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
887 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); 886 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
888 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); 887 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
889 EXPECT_FALSE(IsHelpAvailableOnDetailMenu()); 888 EXPECT_FALSE(IsHelpAvailableOnDetailMenu());
890 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu()); 889 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
891 CloseDetailMenu(); 890 CloseDetailMenu();
892 891
893 ash::test::TestSessionStateDelegate* session_state_delegate = 892 session_manager::SessionManager::Get()->SetSessionState(
894 new ash::test::TestSessionStateDelegate; 893 session_manager::SessionState::LOGIN_SECONDARY);
895 ash::test::ShellTestApi test_api(ash::Shell::GetInstance()); 894 base::RunLoop().RunUntilIdle(); // Flush session state to ash.
896 test_api.SetSessionStateDelegate(session_state_delegate);
897 session_state_delegate->SetUserAddingScreenRunning(true);
898 SetLoginStatus(ash::LoginStatus::USER); 895 SetLoginStatus(ash::LoginStatus::USER);
899 EXPECT_TRUE(CreateDetailedMenu()); 896 EXPECT_TRUE(CreateDetailedMenu());
900 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); 897 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
901 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); 898 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
902 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); 899 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
903 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu()); 900 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
904 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); 901 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
905 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); 902 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
906 EXPECT_FALSE(IsHelpAvailableOnDetailMenu()); 903 EXPECT_FALSE(IsHelpAvailableOnDetailMenu());
907 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu()); 904 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
908 CloseDetailMenu(); 905 CloseDetailMenu();
909 } 906 }
910 907
911 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, 908 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
912 TrayAccessibilityTest, 909 TrayAccessibilityTest,
913 testing::Values(PREF_SERVICE, 910 testing::Values(PREF_SERVICE,
914 POLICY)); 911 POLICY));
915 912
916 } // namespace chromeos 913 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698