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

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

Issue 2046563009: Make the focus, caret, and cursor highlights fade out. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move initialization to header, fix compile error Created 4 years, 6 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 fc1eea799e41ca6bb225ab0b32c760a3a77f708c..50d29e17c481c4b07697139e7f726a9965f5c6f3 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -1014,9 +1014,15 @@ void AccessibilityManager::UpdateFocusHighlightFromPref() {
if (!profile_)
return;
- const bool enabled = profile_->GetPrefs()->GetBoolean(
+ bool enabled = profile_->GetPrefs()->GetBoolean(
prefs::kAccessibilityFocusHighlightEnabled);
+ // Focus highlighting can't be on when spoken feedback is on, because
+ // ChromeVox does its own focus highlighting.
+ if (profile_->GetPrefs()->GetBoolean(
+ prefs::kAccessibilitySpokenFeedbackEnabled))
+ enabled = false;
+
if (focus_highlight_enabled_ == enabled)
return;
focus_highlight_enabled_ = enabled;
@@ -1500,7 +1506,8 @@ void AccessibilityManager::PostUnloadChromeVox(Profile* profile) {
ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED);
// Clear the accessibility focus ring.
AccessibilityFocusRingController::GetInstance()->SetFocusRing(
- std::vector<gfx::Rect>());
+ std::vector<gfx::Rect>(),
+ AccessibilityFocusRingController::PERSIST_FOCUS_RING);
}
void AccessibilityManager::OnChromeVoxPanelClosing() {

Powered by Google App Engine
This is Rietveld 408576698