Chrome OS Accessibility: enable cursor compositing when screen magnifier is enabled.

chrome/browser/chromeos/accessibility/accessibility_manager.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 
 #include "ash/audio/sounds.h"
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 341 matching lines @@
         pref_service->GetBoolean(prefs::kHighContrastEnabled) ||
         pref_service->GetBoolean(prefs::kAutoclickEnabled) ||
         pref_service->GetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu) ||
         pref_service->GetBoolean(prefs::kScreenMagnifierEnabled) ||
         pref_service->GetBoolean(prefs::kVirtualKeyboardEnabled))
       return true;
   }
   return false;
 }
 
+bool AccessibilityManager::ShouldEnableCursorCompositing() {
+#if defined(OS_CHROMEOS)
+  if (!profile_)
+    return false;
+  PrefService* pref_service = profile_->GetPrefs();
+  // Enable cursor compositing when one or more of the listed accessibility
+  // features are turned on.
+  if (pref_service->GetBoolean(prefs::kLargeCursorEnabled) ||
+      pref_service->GetBoolean(prefs::kHighContrastEnabled) ||
+      pref_service->GetBoolean(prefs::kScreenMagnifierEnabled))
+    return true;
+#endif
+  return false;
+}
+
 void AccessibilityManager::EnableLargeCursor(bool enabled) {
   if (!profile_)
     return;
 
   PrefService* pref_service = profile_->GetPrefs();
   pref_service->SetBoolean(prefs::kLargeCursorEnabled, enabled);
   pref_service->CommitPendingWrite();
 }
 
 void AccessibilityManager::UpdateLargeCursorFromPref() {
@@ skipping 14 matching lines @@
       content::NotificationService::AllSources(),
       content::Details<AccessibilityStatusEventDetails>(&details));
 
 #if defined(USE_ASH)
   // Large cursor is implemented only in ash.
   ash::Shell::GetInstance()->cursor_manager()->SetCursorSet(
       enabled ? ui::CURSOR_SET_LARGE : ui::CURSOR_SET_NORMAL);
 #endif
 
 #if defined(OS_CHROMEOS)
-  // Enable cursor compositing mode when using high contrast or large cursor.
   ash::Shell::GetInstance()->SetCursorCompositingEnabled(
-      large_cursor_enabled_ || high_contrast_enabled_);
+      ShouldEnableCursorCompositing());
 #endif
 }
 
 bool AccessibilityManager::IsIncognitoAllowed() {
   UserManager* user_manager = UserManager::Get();
   // Supervised users can't create incognito-mode windows.
   return !(user_manager->IsLoggedInAsLocallyManagedUser());
 }
 
 bool AccessibilityManager::IsLargeCursorEnabled() {
@@ skipping 183 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE,
       content::NotificationService::AllSources(),
       content::Details<AccessibilityStatusEventDetails>(&detail));
 
 #if defined(USE_ASH)
   ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(enabled);
 #endif
 
 #if defined(OS_CHROMEOS)
-  // Enable cursor compositing mode when using high contrast or large cursor.
   ash::Shell::GetInstance()->SetCursorCompositingEnabled(
-      large_cursor_enabled_ || high_contrast_enabled_);
+      ShouldEnableCursorCompositing());
 #endif
 }
 
 void AccessibilityManager::LocalePrefChanged() {
   if (!profile_)
     return;
 
   if (!IsSpokenFeedbackEnabled())
     return;
 
@@ skipping 334 matching lines @@
 
 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) {
   // Do any teardown work needed immediately after ChromeVox actually unloads.
   if (system_sounds_enabled_) {
     ash::PlaySystemSound(SOUND_SPOKEN_FEEDBACK_DISABLED,
                          false /* honor_spoken_feedback */);
   }
 }
 
 }  // namespace chromeos