diff options
author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 20:35:58 +0000 |
---|---|---|
committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 20:35:58 +0000 |
commit | c2012257a7427da20e5898bf6038cf10b3ec3e89 (patch) | |
tree | 7dea4436ec1c4cd06f39bfb9d5424213fecb075c /ash/system/tray_accessibility.cc | |
parent | d28775d2e8c2538a0bbea0fcb6f341a8ae861026 (diff) | |
download | chromium_src-c2012257a7427da20e5898bf6038cf10b3ec3e89.zip chromium_src-c2012257a7427da20e5898bf6038cf10b3ec3e89.tar.gz chromium_src-c2012257a7427da20e5898bf6038cf10b3ec3e89.tar.bz2 |
Getting rid of GetDefaultProfile & fixing multi user issues with accessibility
As discussed: I removed the occurances, switched the accessibility functionality with a user change and made sure that the accessibility menu is presented when at least one user has one accessibility feature turned on.
Not done:
- ChromeVox - this will most likely only partially work in multi user scenarios. It makes no sense to get this 80% working if we are in the midst of overhauling the use of ChromeVox. This needs to be re-visited once the changes are done.
- BrailleDisplayAPI - Since this is coupled with ChromeVox I guess that this falls into the same problem.
- MagnifierManager - A refactor should be done which merges this into the AccessibilityManager, but that would go beyond what we currently have to do. Besides I have found a comment which indicates that this might even be underway.
BUG=322682
TEST=unit tests (and multi profile by visual tests)
Review URL: https://codereview.chromium.org/102483006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/tray_accessibility.cc')
-rw-r--r-- | ash/system/tray_accessibility.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc index fc77b3e..8b1902d 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); |