Implement cursor compositing mode on Ash

chrome/browser/chromeos/accessibility/accessibility_manager.cc

Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index 216862b2c0c11b3639d0b4bec2f7ba77473a6ecc..c7bdd204ee24d3c82c28d90250607d81a3752dbc 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -394,6 +394,12 @@ void AccessibilityManager::UpdateLargeCursorFromPref() {
   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() {
@@ -592,6 +598,12 @@ void AccessibilityManager::UpdateHighContrastFromPref() {
 #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() {