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

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: Fixed unit test 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
« no previous file with comments | « ash/session_state_observer.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_accessibility.cc
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index fc77b3ec4a80920022b795488522bc12f966b8a7..8b1902df5e6388348d0470bb91446c692d094be5 100644
--- a/ash/system/tray_accessibility.cc
+++ b/ash/system/tray_accessibility.cc
@@ -326,10 +326,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);
« no previous file with comments | « ash/session_state_observer.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698