Implement cursor compositing mode on Ash

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 376 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_LARGE_CURSOR,
       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) && defined(USE_X11)
+  // Enable cursor compositing mode when using high contrast or large cursor.
+  ash::Shell::GetInstance()->SetCursorCompositingEnabled(
+      large_cursor_enabled_ || high_contrast_enabled_);
+#endif
 }
 
 bool AccessibilityManager::IsIncognitoAllowed() {
   UserManager* user_manager = UserManager::Get();
   // Supervised users can't create incognito-mode windows.
   return !(user_manager->IsLoggedInAsLocallyManagedUser());
 }
 
 bool AccessibilityManager::IsLargeCursorEnabled() {
   return large_cursor_enabled_;
@@ skipping 178 matching lines @@
 
   AccessibilityStatusEventDetails detail(enabled, ash::A11Y_NOTIFICATION_NONE);
   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) && defined(USE_X11)

[oshima, 2014/02/05 23:43:39]

do you need USE_X11 here?

[hshi1, 2014/02/06 00:48:44]

Done.

+  // Enable cursor compositing mode when using high contrast or large cursor.
+  ash::Shell::GetInstance()->SetCursorCompositingEnabled(
+      large_cursor_enabled_ || high_contrast_enabled_);
+#endif
 }
 
 void AccessibilityManager::LocalePrefChanged() {
   if (!profile_)
     return;
 
   if (!IsSpokenFeedbackEnabled())
     return;
 
   // If the system locale changes and spoken feedback is enabled,
@@ skipping 329 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