Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/magnifier/magnification_controller.h" | 5 #include "ash/magnifier/magnification_controller.h" |
| 6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
| 7 #include "ash/system/tray/system_tray.h" | 7 #include "ash/system/tray/system_tray.h" |
| 8 #include "ash/system/tray_accessibility.h" | 8 #include "ash/system/tray_accessibility.h" |
| 9 #include "ash/system/user/login_status.h" | 9 #include "ash/system/user/login_status.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 262 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) { | 262 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) { |
| 263 EXPECT_EQ(ash::user::LOGGED_IN_NONE, GetLoginStatus()); | 263 EXPECT_EQ(ash::user::LOGGED_IN_NONE, GetLoginStatus()); |
| 264 | 264 |
| 265 UserManager::Get()->UserLoggedIn( | 265 UserManager::Get()->UserLoggedIn( |
| 266 "owner@invalid.domain", "owner@invalid.domain", true); | 266 "owner@invalid.domain", "owner@invalid.domain", true); |
| 267 UserManager::Get()->SessionStarted(); | 267 UserManager::Get()->SessionStarted(); |
| 268 | 268 |
| 269 EXPECT_EQ(ash::user::LOGGED_IN_USER, GetLoginStatus()); | 269 EXPECT_EQ(ash::user::LOGGED_IN_USER, GetLoginStatus()); |
| 270 } | 270 } |
| 271 | 271 |
| 272 // http://crbug.com/396342 | |
| 273 #if 0 | |
| 272 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) { | 274 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) { |
|
viettrungluu
2014/07/23 15:35:02
You should be able to disable these with DISABLED_
jam
2014/07/23 16:28:26
Done.
| |
| 273 SetLoginStatus(ash::user::LOGGED_IN_NONE); | 275 SetLoginStatus(ash::user::LOGGED_IN_NONE); |
| 274 | 276 |
| 275 // Confirms that the icon is invisible before login. | 277 // Confirms that the icon is invisible before login. |
| 276 EXPECT_FALSE(IsTrayIconVisible()); | 278 EXPECT_FALSE(IsTrayIconVisible()); |
| 277 | 279 |
| 278 UserManager::Get()->UserLoggedIn( | 280 UserManager::Get()->UserLoggedIn( |
| 279 "owner@invalid.domain", "owner@invalid.domain", true); | 281 "owner@invalid.domain", "owner@invalid.domain", true); |
| 280 UserManager::Get()->SessionStarted(); | 282 UserManager::Get()->SessionStarted(); |
| 281 | 283 |
| 282 // Confirms that the icon is invisible just after login. | 284 // Confirms that the icon is invisible just after login. |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 330 EXPECT_FALSE(IsTrayIconVisible()); | 332 EXPECT_FALSE(IsTrayIconVisible()); |
| 331 | 333 |
| 332 // Confirms that prefs::kShouldAlwaysShowAccessibilityMenu doesn't affect | 334 // Confirms that prefs::kShouldAlwaysShowAccessibilityMenu doesn't affect |
| 333 // the icon on the tray. | 335 // the icon on the tray. |
| 334 SetShowAccessibilityOptionsInSystemTrayMenu(true); | 336 SetShowAccessibilityOptionsInSystemTrayMenu(true); |
| 335 AccessibilityManager::Get()->EnableHighContrast(true); | 337 AccessibilityManager::Get()->EnableHighContrast(true); |
| 336 EXPECT_TRUE(IsTrayIconVisible()); | 338 EXPECT_TRUE(IsTrayIconVisible()); |
| 337 AccessibilityManager::Get()->EnableHighContrast(false); | 339 AccessibilityManager::Get()->EnableHighContrast(false); |
| 338 EXPECT_FALSE(IsTrayIconVisible()); | 340 EXPECT_FALSE(IsTrayIconVisible()); |
| 339 } | 341 } |
| 342 #endif | |
| 340 | 343 |
| 344 // http://crbug.com/396342 | |
| 345 #if 0 | |
| 341 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) { | 346 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) { |
| 342 // Login | 347 // Login |
| 343 UserManager::Get()->UserLoggedIn( | 348 UserManager::Get()->UserLoggedIn( |
| 344 "owner@invalid.domain", "owner@invalid.domain", true); | 349 "owner@invalid.domain", "owner@invalid.domain", true); |
| 345 UserManager::Get()->SessionStarted(); | 350 UserManager::Get()->SessionStarted(); |
| 346 | 351 |
| 347 SetShowAccessibilityOptionsInSystemTrayMenu(false); | 352 SetShowAccessibilityOptionsInSystemTrayMenu(false); |
| 348 | 353 |
| 349 // Confirms that the menu is hidden. | 354 // Confirms that the menu is hidden. |
| 350 EXPECT_FALSE(CanCreateMenuItem()); | 355 EXPECT_FALSE(CanCreateMenuItem()); |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 398 AccessibilityManager::Get()->EnableAutoclick(false); | 403 AccessibilityManager::Get()->EnableAutoclick(false); |
| 399 EXPECT_TRUE(CanCreateMenuItem()); | 404 EXPECT_TRUE(CanCreateMenuItem()); |
| 400 AccessibilityManager::Get()->EnableSpokenFeedback( | 405 AccessibilityManager::Get()->EnableSpokenFeedback( |
| 401 false, ash::A11Y_NOTIFICATION_NONE); | 406 false, ash::A11Y_NOTIFICATION_NONE); |
| 402 EXPECT_TRUE(CanCreateMenuItem()); | 407 EXPECT_TRUE(CanCreateMenuItem()); |
| 403 AccessibilityManager::Get()->EnableHighContrast(false); | 408 AccessibilityManager::Get()->EnableHighContrast(false); |
| 404 EXPECT_TRUE(CanCreateMenuItem()); | 409 EXPECT_TRUE(CanCreateMenuItem()); |
| 405 SetMagnifierEnabled(false); | 410 SetMagnifierEnabled(false); |
| 406 EXPECT_FALSE(CanCreateMenuItem()); | 411 EXPECT_FALSE(CanCreateMenuItem()); |
| 407 } | 412 } |
| 413 #endif | |
| 408 | 414 |
| 415 // http://crbug.com/396318 | |
| 416 #if 0 | |
| 409 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) { | 417 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) { |
| 410 // Login | 418 // Login |
| 411 UserManager::Get()->UserLoggedIn( | 419 UserManager::Get()->UserLoggedIn( |
| 412 "owner@invalid.domain", "owner@invalid.domain", true); | 420 "owner@invalid.domain", "owner@invalid.domain", true); |
| 413 UserManager::Get()->SessionStarted(); | 421 UserManager::Get()->SessionStarted(); |
| 414 | 422 |
| 415 SetShowAccessibilityOptionsInSystemTrayMenu(true); | 423 SetShowAccessibilityOptionsInSystemTrayMenu(true); |
| 416 | 424 |
| 417 // Confirms that the menu is visible. | 425 // Confirms that the menu is visible. |
| 418 EXPECT_TRUE(CanCreateMenuItem()); | 426 EXPECT_TRUE(CanCreateMenuItem()); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 471 AccessibilityManager::Get()->EnableHighContrast(false); | 479 AccessibilityManager::Get()->EnableHighContrast(false); |
| 472 EXPECT_TRUE(CanCreateMenuItem()); | 480 EXPECT_TRUE(CanCreateMenuItem()); |
| 473 SetMagnifierEnabled(false); | 481 SetMagnifierEnabled(false); |
| 474 EXPECT_TRUE(CanCreateMenuItem()); | 482 EXPECT_TRUE(CanCreateMenuItem()); |
| 475 | 483 |
| 476 SetShowAccessibilityOptionsInSystemTrayMenu(false); | 484 SetShowAccessibilityOptionsInSystemTrayMenu(false); |
| 477 | 485 |
| 478 // Confirms that the menu is invisible. | 486 // Confirms that the menu is invisible. |
| 479 EXPECT_FALSE(CanCreateMenuItem()); | 487 EXPECT_FALSE(CanCreateMenuItem()); |
| 480 } | 488 } |
| 489 #endif | |
| 481 | 490 |
| 482 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) { | 491 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) { |
| 483 SetLoginStatus(ash::user::LOGGED_IN_NONE); | 492 SetLoginStatus(ash::user::LOGGED_IN_NONE); |
| 484 | 493 |
| 485 // Confirms that the menu is visible. | 494 // Confirms that the menu is visible. |
| 486 EXPECT_TRUE(CanCreateMenuItem()); | 495 EXPECT_TRUE(CanCreateMenuItem()); |
| 487 | 496 |
| 488 // The menu remains visible regardless of toggling spoken feedback. | 497 // The menu remains visible regardless of toggling spoken feedback. |
| 489 AccessibilityManager::Get()->EnableSpokenFeedback( | 498 AccessibilityManager::Get()->EnableSpokenFeedback( |
| 490 true, ash::A11Y_NOTIFICATION_NONE); | 499 true, ash::A11Y_NOTIFICATION_NONE); |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 873 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); | 882 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); |
| 874 CloseDetailMenu(); | 883 CloseDetailMenu(); |
| 875 } | 884 } |
| 876 | 885 |
| 877 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, | 886 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, |
| 878 TrayAccessibilityTest, | 887 TrayAccessibilityTest, |
| 879 testing::Values(PREF_SERVICE, | 888 testing::Values(PREF_SERVICE, |
| 880 POLICY)); | 889 POLICY)); |
| 881 | 890 |
| 882 } // namespace chromeos | 891 } // namespace chromeos |
| OLD | NEW |