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

Side by Side Diff: ash/system/tray_accessibility.cc

Issue 1840913002: A11y setting: mono audio UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix SettingsAdvancedPageBrowserTest.Load browser_test failure Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/tray_accessibility.h" 5 #include "ash/system/tray_accessibility.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/metrics/user_metrics_recorder.h" 8 #include "ash/metrics/user_metrics_recorder.h"
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 21 matching lines...) Expand all
32 32
33 enum AccessibilityState { 33 enum AccessibilityState {
34 A11Y_NONE = 0, 34 A11Y_NONE = 0,
35 A11Y_SPOKEN_FEEDBACK = 1 << 0, 35 A11Y_SPOKEN_FEEDBACK = 1 << 0,
36 A11Y_HIGH_CONTRAST = 1 << 1, 36 A11Y_HIGH_CONTRAST = 1 << 1,
37 A11Y_SCREEN_MAGNIFIER = 1 << 2, 37 A11Y_SCREEN_MAGNIFIER = 1 << 2,
38 A11Y_LARGE_CURSOR = 1 << 3, 38 A11Y_LARGE_CURSOR = 1 << 3,
39 A11Y_AUTOCLICK = 1 << 4, 39 A11Y_AUTOCLICK = 1 << 4,
40 A11Y_VIRTUAL_KEYBOARD = 1 << 5, 40 A11Y_VIRTUAL_KEYBOARD = 1 << 5,
41 A11Y_BRAILLE_DISPLAY_CONNECTED = 1 << 6, 41 A11Y_BRAILLE_DISPLAY_CONNECTED = 1 << 6,
42 A11Y_MONO_AUDIO = 1 << 7,
42 }; 43 };
43 44
44 uint32_t GetAccessibilityState() { 45 uint32_t GetAccessibilityState() {
45 AccessibilityDelegate* delegate = 46 AccessibilityDelegate* delegate =
46 Shell::GetInstance()->accessibility_delegate(); 47 Shell::GetInstance()->accessibility_delegate();
47 uint32_t state = A11Y_NONE; 48 uint32_t state = A11Y_NONE;
48 if (delegate->IsSpokenFeedbackEnabled()) 49 if (delegate->IsSpokenFeedbackEnabled())
49 state |= A11Y_SPOKEN_FEEDBACK; 50 state |= A11Y_SPOKEN_FEEDBACK;
50 if (delegate->IsHighContrastEnabled()) 51 if (delegate->IsHighContrastEnabled())
51 state |= A11Y_HIGH_CONTRAST; 52 state |= A11Y_HIGH_CONTRAST;
52 if (delegate->IsMagnifierEnabled()) 53 if (delegate->IsMagnifierEnabled())
53 state |= A11Y_SCREEN_MAGNIFIER; 54 state |= A11Y_SCREEN_MAGNIFIER;
54 if (delegate->IsLargeCursorEnabled()) 55 if (delegate->IsLargeCursorEnabled())
55 state |= A11Y_LARGE_CURSOR; 56 state |= A11Y_LARGE_CURSOR;
56 if (delegate->IsAutoclickEnabled()) 57 if (delegate->IsAutoclickEnabled())
57 state |= A11Y_AUTOCLICK; 58 state |= A11Y_AUTOCLICK;
58 if (delegate->IsVirtualKeyboardEnabled()) 59 if (delegate->IsVirtualKeyboardEnabled())
59 state |= A11Y_VIRTUAL_KEYBOARD; 60 state |= A11Y_VIRTUAL_KEYBOARD;
60 if (delegate->IsBrailleDisplayConnected()) 61 if (delegate->IsBrailleDisplayConnected())
61 state |= A11Y_BRAILLE_DISPLAY_CONNECTED; 62 state |= A11Y_BRAILLE_DISPLAY_CONNECTED;
63 if (delegate->IsMonoAudioEnabled())
64 state |= A11Y_MONO_AUDIO;
62 return state; 65 return state;
63 } 66 }
64 67
65 user::LoginStatus GetCurrentLoginStatus() { 68 user::LoginStatus GetCurrentLoginStatus() {
66 return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus(); 69 return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
67 } 70 }
68 71
69 } // namespace 72 } // namespace
70 73
71 namespace tray { 74 namespace tray {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 SystemTrayItem* owner, user::LoginStatus login) : 130 SystemTrayItem* owner, user::LoginStatus login) :
128 TrayDetailsView(owner), 131 TrayDetailsView(owner),
129 spoken_feedback_view_(NULL), 132 spoken_feedback_view_(NULL),
130 high_contrast_view_(NULL), 133 high_contrast_view_(NULL),
131 screen_magnifier_view_(NULL), 134 screen_magnifier_view_(NULL),
132 large_cursor_view_(NULL), 135 large_cursor_view_(NULL),
133 help_view_(NULL), 136 help_view_(NULL),
134 settings_view_(NULL), 137 settings_view_(NULL),
135 autoclick_view_(NULL), 138 autoclick_view_(NULL),
136 virtual_keyboard_view_(NULL), 139 virtual_keyboard_view_(NULL),
140 mono_audio_view_(NULL),
137 spoken_feedback_enabled_(false), 141 spoken_feedback_enabled_(false),
138 high_contrast_enabled_(false), 142 high_contrast_enabled_(false),
139 screen_magnifier_enabled_(false), 143 screen_magnifier_enabled_(false),
140 large_cursor_enabled_(false), 144 large_cursor_enabled_(false),
141 autoclick_enabled_(false), 145 autoclick_enabled_(false),
142 virtual_keyboard_enabled_(false), 146 virtual_keyboard_enabled_(false),
147 mono_audio_enabled_(false),
oshima 2016/04/11 17:05:30 is this used?
Qiang(Joe) Xu 2016/04/11 20:59:09 Not used. It is now updated, deleting both mono_au
143 login_(login) { 148 login_(login) {
144 149
145 Reset(); 150 Reset();
146 151
147 AppendAccessibilityList(); 152 AppendAccessibilityList();
148 AppendHelpEntries(); 153 AppendHelpEntries();
149 CreateSpecialRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE, this); 154 CreateSpecialRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE, this);
150 155
151 Layout(); 156 Layout();
152 } 157 }
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 delegate->IsAutoclickEnabled() ? 286 delegate->IsAutoclickEnabled() ?
282 ash::UMA_STATUS_AREA_DISABLE_AUTO_CLICK : 287 ash::UMA_STATUS_AREA_DISABLE_AUTO_CLICK :
283 ash::UMA_STATUS_AREA_ENABLE_AUTO_CLICK); 288 ash::UMA_STATUS_AREA_ENABLE_AUTO_CLICK);
284 delegate->SetAutoclickEnabled(!delegate->IsAutoclickEnabled()); 289 delegate->SetAutoclickEnabled(!delegate->IsAutoclickEnabled());
285 } else if (virtual_keyboard_view_ && sender == virtual_keyboard_view_) { 290 } else if (virtual_keyboard_view_ && sender == virtual_keyboard_view_) {
286 Shell::GetInstance()->metrics()->RecordUserMetricsAction( 291 Shell::GetInstance()->metrics()->RecordUserMetricsAction(
287 delegate->IsVirtualKeyboardEnabled() ? 292 delegate->IsVirtualKeyboardEnabled() ?
288 ash::UMA_STATUS_AREA_DISABLE_VIRTUAL_KEYBOARD : 293 ash::UMA_STATUS_AREA_DISABLE_VIRTUAL_KEYBOARD :
289 ash::UMA_STATUS_AREA_ENABLE_VIRTUAL_KEYBOARD); 294 ash::UMA_STATUS_AREA_ENABLE_VIRTUAL_KEYBOARD);
290 delegate->SetVirtualKeyboardEnabled(!delegate->IsVirtualKeyboardEnabled()); 295 delegate->SetVirtualKeyboardEnabled(!delegate->IsVirtualKeyboardEnabled());
296 } else if (mono_audio_view_ && sender == mono_audio_view_) {
297 Shell::GetInstance()->metrics()->RecordUserMetricsAction(
298 delegate->IsMonoAudioEnabled() ?
299 ash::UMA_STATUS_AREA_DISABLE_MONO_AUDIO :
300 ash::UMA_STATUS_AREA_ENABLE_MONO_AUDIO);
301 delegate->SetMonoAudioEnabled(!delegate->IsMonoAudioEnabled());
291 } 302 }
292 } 303 }
293 304
294 void AccessibilityDetailedView::ButtonPressed(views::Button* sender, 305 void AccessibilityDetailedView::ButtonPressed(views::Button* sender,
295 const ui::Event& event) { 306 const ui::Event& event) {
296 SystemTrayDelegate* tray_delegate = 307 SystemTrayDelegate* tray_delegate =
297 Shell::GetInstance()->system_tray_delegate(); 308 Shell::GetInstance()->system_tray_delegate();
298 if (sender == help_view_) 309 if (sender == help_view_)
299 tray_delegate->ShowAccessibilityHelp(); 310 tray_delegate->ShowAccessibilityHelp();
300 else if (sender == settings_view_) 311 else if (sender == settings_view_)
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 if (detailed_popup_) 435 if (detailed_popup_)
425 detailed_popup_->GetWidget()->Close(); 436 detailed_popup_->GetWidget()->Close();
426 if (detailed_menu_) 437 if (detailed_menu_)
427 detailed_menu_->GetWidget()->Close(); 438 detailed_menu_->GetWidget()->Close();
428 } 439 }
429 440
430 previous_accessibility_state_ = accessibility_state; 441 previous_accessibility_state_ = accessibility_state;
431 } 442 }
432 443
433 } // namespace ash 444 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698