Index: ash/system/tray_accessibility.cc |
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc |
index f064a5f9250a1ab4699bbefed13744c2e87529c5..4dfc709138b88fa8abe50d78f6426359328d476d 100644 |
--- a/ash/system/tray_accessibility.cc |
+++ b/ash/system/tray_accessibility.cc |
@@ -291,7 +291,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) { |
@@ -305,10 +306,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); |