| 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 cc9d583eaa27ca4ecd59e1c59ea7c730b7641bd2..a15a66c63850de4f290556253d128ed205a67536 100644
 | 
| --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
 | 
| +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
 | 
| @@ -371,8 +371,17 @@ bool AccessibilityManager::ShouldShowAccessibilityMenu() {
 | 
|  }
 | 
|  
 | 
|  bool AccessibilityManager::ShouldEnableCursorCompositing() {
 | 
| -  // TODO(hshi): re-enable this on trunk after fixing issues. See
 | 
| -  // http://crbug.com/362693, http://crosbug.com/p/28034.
 | 
| +#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;
 | 
|  }
 | 
|  
 | 
| 
 |