| Index: ash/system/tray_accessibility.cc
|
| diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
|
| index fc77b3ec4a80920022b795488522bc12f966b8a7..f83ae5096eaa8dd8700cd93cdff8594aa96cd872 100644
|
| --- a/ash/system/tray_accessibility.cc
|
| +++ b/ash/system/tray_accessibility.cc
|
| @@ -312,7 +312,8 @@ tray::AccessibilityDetailedView* TrayAccessibility::CreateDetailedMenu() {
|
| bool TrayAccessibility::GetInitialVisibility() {
|
| // Shows accessibility icon if any accessibility feature is enabled.
|
| // Otherwise, doen't show it.
|
| - return GetAccessibilityState() != A11Y_NONE;
|
| + return Shell::GetInstance()->accessibility_delegate()->
|
| + ShouldShowAccessibilityMenu();
|
| }
|
|
|
| views::View* TrayAccessibility::CreateDefaultView(user::LoginStatus status) {
|
| @@ -326,10 +327,9 @@ views::View* TrayAccessibility::CreateDefaultView(user::LoginStatus status) {
|
| AccessibilityDelegate* delegate =
|
| Shell::GetInstance()->accessibility_delegate();
|
| if (login_ != user::LOGGED_IN_NONE &&
|
| - !delegate->ShouldAlwaysShowAccessibilityMenu() &&
|
| - // On login screen, keeps the initial visivility of the menu.
|
| - (status != user::LOGGED_IN_LOCKED || !show_a11y_menu_on_lock_screen_) &&
|
| - GetAccessibilityState() == A11Y_NONE)
|
| + !delegate->ShouldShowAccessibilityMenu() &&
|
| + // On login screen, keeps the initial visibility of the menu.
|
| + (status != user::LOGGED_IN_LOCKED || !show_a11y_menu_on_lock_screen_))
|
| return NULL;
|
|
|
| CHECK(default_ == NULL);
|
|
|