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

Unified Diff: ash/system/tray/system_tray.cc

Issue 1577973002: Merge to m48: Fix volume slider to emit value changed events and do not focus system tray it\ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
Patch Set: Created 4 years, 11 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: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 715c7afa7aae85c1acf8096dd12a60ea9115d743..396762c22d48c70615d30e7d32b43668f1349044 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -98,9 +98,12 @@ class SystemBubbleWrapper {
views::BubbleBorder::PAINT_NONE);
is_persistent_ = is_persistent;
- // If ChromeVox is enabled, focus the default item if no item is focused.
- if (Shell::GetInstance()->accessibility_delegate()->
- IsSpokenFeedbackEnabled()) {
+ // If ChromeVox is enabled, focus the default item if no item is focused and
+ // there isn't a delayed close.
+ if (Shell::GetInstance()
+ ->accessibility_delegate()
+ ->IsSpokenFeedbackEnabled() &&
+ !is_persistent) {
bubble_->FocusDefaultIfNeeded();
}
}
« no previous file with comments | « ash/system/audio/volume_view.cc ('k') | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698