Large Cursor: Add the toggle menuitem to a11y menu in uber tray

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/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 18 matching lines @@
 namespace internal {
 
 namespace {
 const int kPaddingAroundBottomRow = 5;
 
 enum AccessibilityState {
   A11Y_NONE             = 0,
   A11Y_SPOKEN_FEEDBACK  = 1 << 0,
   A11Y_HIGH_CONTRAST    = 1 << 1,
   A11Y_SCREEN_MAGNIFIER = 1 << 2,
+  A11Y_LARGE_CURSOR     = 1 << 3,
 };
 
 uint32 GetAccessibilityState() {
   ShellDelegate* shell_delegate = Shell::GetInstance()->delegate();
   uint32 state = A11Y_NONE;
   if (shell_delegate->IsSpokenFeedbackEnabled())
     state |= A11Y_SPOKEN_FEEDBACK;
   if (shell_delegate->IsHighContrastEnabled())
     state |= A11Y_HIGH_CONTRAST;
   if (shell_delegate->IsMagnifierEnabled())
     state |= A11Y_SCREEN_MAGNIFIER;
+  if (shell_delegate->IsLargeCursorEnabled())
+    state |= A11Y_LARGE_CURSOR;
   return state;
 }
 
 user::LoginStatus GetCurrentLoginStatus() {
   return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
 }
 
 }  // namespace
 
 namespace tray {
@@ skipping 40 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::internal::tray::AccessibilityDetailedView
 
 AccessibilityDetailedView::AccessibilityDetailedView(
     SystemTrayItem* owner, user::LoginStatus login) :
         TrayDetailsView(owner),
         spoken_feedback_view_(NULL),
         high_contrast_view_(NULL),
         screen_magnifier_view_(NULL),
+        large_cursor_view_(NULL),
         help_view_(NULL),
         settings_view_(NULL),
         spoken_feedback_enabled_(false),
         high_contrast_enabled_(false),
         screen_magnifier_enabled_(false),
+        large_cursor_enabled_(false),
         login_(login) {
 
   Reset();
 
   AppendAccessibilityList();
   AppendHelpEntries();
   CreateSpecialRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE, this);
 
   Layout();
 }
 
 void AccessibilityDetailedView::AppendAccessibilityList() {
   CreateScrollableList();
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
   ShellDelegate* shell_delegate = Shell::GetInstance()->delegate();
   spoken_feedback_enabled_ = shell_delegate->IsSpokenFeedbackEnabled();
   spoken_feedback_view_ = AddScrollListItem(
       bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK),
       spoken_feedback_enabled_ ? gfx::Font::BOLD : gfx::Font::NORMAL,
       spoken_feedback_enabled_);
+
+  // Large Cursor item is shown only in Login screen.
+  if (login_ == user::LOGGED_IN_NONE) {
+    large_cursor_enabled_ = shell_delegate->IsLargeCursorEnabled();
+    large_cursor_view_ = AddScrollListItem(
+        bundle.GetLocalizedString(
+            IDS_ASH_STATUS_TRAY_ACCESSIBILITY_LARGE_CURSOR),
+        large_cursor_enabled_ ? gfx::Font::BOLD : gfx::Font::NORMAL,
+        large_cursor_enabled_);
+  }
+
   high_contrast_enabled_ = shell_delegate->IsHighContrastEnabled();
   high_contrast_view_ = AddScrollListItem(
       bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_HIGH_CONTRAST_MODE),
       high_contrast_enabled_ ? gfx::Font::BOLD : gfx::Font::NORMAL,
       high_contrast_enabled_);
   screen_magnifier_enabled_ = shell_delegate->IsMagnifierEnabled();
   screen_magnifier_view_ = AddScrollListItem(
       bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SCREEN_MAGNIFIER),
@@ skipping 49 matching lines @@
 void AccessibilityDetailedView::OnViewClicked(views::View* sender) {
   ShellDelegate* shell_delegate = Shell::GetInstance()->delegate();
   if (sender == footer()->content()) {
     owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   } else if (sender == spoken_feedback_view_) {
     shell_delegate->ToggleSpokenFeedback(ash::A11Y_NOTIFICATION_NONE);
   } else if (sender == high_contrast_view_) {
     shell_delegate->ToggleHighContrast();
   } else if (sender == screen_magnifier_view_) {
     shell_delegate->SetMagnifierEnabled(!shell_delegate->IsMagnifierEnabled());
+  } else if (large_cursor_view_ && sender == large_cursor_view_) {
+    shell_delegate->
+        SetLargeCursorEnabled(!shell_delegate->IsLargeCursorEnabled());
   }
 }
 
 void AccessibilityDetailedView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   SystemTrayDelegate* tray_delegate =
       Shell::GetInstance()->system_tray_delegate();
   if (sender == help_view_)
     tray_delegate->ShowAccessibilityHelp();
   else if (sender == settings_view_)
@@ skipping 37 matching lines @@
 
 bool TrayAccessibility::GetInitialVisibility() {
   // Shows accessibility icon if any accessibility feature is enabled.
   // Otherwise, doen't show it.
   return GetAccessibilityState() != A11Y_NONE;
 }
 
 views::View* TrayAccessibility::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
 
-  login_ = status;
-
   // 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.
   ShellDelegate* delegate = Shell::GetInstance()->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)
     return NULL;
 
   CHECK(default_ == NULL);
   default_ = new tray::DefaultAccessibilityView(this);
 
   return default_;
 }
 
 views::View* TrayAccessibility::CreateDetailedView(user::LoginStatus status) {
   CHECK(detailed_popup_ == NULL);
   CHECK(detailed_menu_ == NULL);
 
-  login_ = status;
-
   if (request_popup_view_) {
     detailed_popup_ = new tray::AccessibilityPopupView(this);
     request_popup_view_ = false;
     return detailed_popup_;
   } else {
     detailed_menu_ = CreateDetailedMenu();
     return detailed_menu_;
   }
 }
 
@@ skipping 31 matching lines @@
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace internal
 }  // namespace ash