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

Unified Diff: ash/system/tray_accessibility.cc

Issue 102483006: Getting rid of GetDefaultProfile & fixing multi user issues with accessibility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Created 7 years 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 side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698