Getting rid of GetDefaultProfile & fixing multi user issues with accessibility

ash/system/tray_accessibility.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray_accessibility.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 273 matching lines @@
   tray_icon_visible_ = visible;
 }
 
 tray::AccessibilityDetailedView* TrayAccessibility::CreateDetailedMenu() {
   return new tray::AccessibilityDetailedView(this, login_);
 }
 
 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) {
   CHECK(default_ == NULL);
 
   // Shows accessibility menu if:
   // - on login screen (not logged in);
   // - "Enable accessibility menu" on chrome://settings is checked;
   // - or any of accessibility features is enabled
   // Otherwise, not shows it.
   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);
   default_ = new tray::DefaultAccessibilityView(this);
 
   return default_;
 }
 
 views::View* TrayAccessibility::CreateDetailedView(user::LoginStatus status) {
   CHECK(detailed_popup_ == NULL);
@@ skipping 43 matching lines @@
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace internal
 }  // namespace ash