Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1483)

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 145313003: Implement cursor compositing mode on Ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always update cursor image in SetCursor. Fixes initial wrong cursor. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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)
+ // 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() {

Powered by Google App Engine
This is Rietveld 408576698