diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 22:02:27 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 22:02:27 +0000 |
| commit | 14ce629fca373268fb0bab68448a442d97384a52 (patch) | |
| tree | 36b8f331481f2ecd01817aa550b6c45b510e7714 | |
| parent | ad7ad28085400f858a4f22bcf03509c5c005542c (diff) | |
| download | chromium_src-14ce629fca373268fb0bab68448a442d97384a52.zip chromium_src-14ce629fca373268fb0bab68448a442d97384a52.tar.gz chromium_src-14ce629fca373268fb0bab68448a442d97384a52.tar.bz2 | |
Merge 233463 "Only focus the default item in the system tray whe..."
> Only focus the default item in the system tray when spoken feedback is enabled
>
> BUG=315302
>
> Review URL: https://codereview.chromium.org/60203005
TBR=zork@chromium.org
Review URL: https://codereview.chromium.org/75413004
git-svn-id: svn://svn.chromium.org/chrome/branches/1700/src@235827 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/system/tray/system_tray.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 4782ec3..65d9ffe 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -99,7 +99,12 @@ class SystemBubbleWrapper { views::BubbleBorder::PAINT_NONE); } is_persistent_ = is_persistent; - bubble_->FocusDefault(); + + // If ChromeVox is enabled, focus the default item. + AccessibilityDelegate* delegate = + Shell::GetInstance()->accessibility_delegate(); + if (delegate->IsSpokenFeedbackEnabled()) + bubble_->FocusDefault(); } // Convenience accessors: |