| 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() {
|
|
|