Chromium Code Reviews| Index: ash/system/tray_accessibility.cc |
| diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc |
| index 3ce65bfec66b080cd571b4c43b0f5ac5a5c22848..0ae364945e48c64db137adcd32b97770177e526f 100644 |
| --- a/ash/system/tray_accessibility.cc |
| +++ b/ash/system/tray_accessibility.cc |
| @@ -121,11 +121,13 @@ AccessibilityDetailedView::AccessibilityDetailedView( |
| help_view_(NULL), |
| settings_view_(NULL), |
| autoclick_view_(NULL), |
| + virtual_keyboard_view_(NULL), |
| spoken_feedback_enabled_(false), |
| high_contrast_enabled_(false), |
| screen_magnifier_enabled_(false), |
| large_cursor_enabled_(false), |
| autoclick_enabled_(false), |
| + virtual_keyboard_enabled_(false), |
| login_(login) { |
| Reset(); |
| @@ -182,6 +184,13 @@ void AccessibilityDetailedView::AppendAccessibilityList() { |
| autoclick_enabled_ ? gfx::Font::BOLD : gfx::Font::NORMAL, |
| autoclick_enabled_); |
| } |
| + |
| + virtual_keyboard_enabled_ = delegate->IsVirtualKeyboardEnabled(); |
| + virtual_keyboard_view_ = AddScrollListItem( |
| + bundle.GetLocalizedString( |
| + IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD), |
| + virtual_keyboard_enabled_ ? gfx::Font::BOLD : gfx::Font::NORMAL, |
| + virtual_keyboard_enabled_); |
| } |
| void AccessibilityDetailedView::AppendHelpEntries() { |
| @@ -264,6 +273,12 @@ void AccessibilityDetailedView::OnViewClicked(views::View* sender) { |
| ash::UMA_STATUS_AREA_DISABLE_AUTO_CLICK : |
| ash::UMA_STATUS_AREA_ENABLE_AUTO_CLICK); |
| delegate->SetAutoclickEnabled(!delegate->IsAutoclickEnabled()); |
| + } else if (virtual_keyboard_view_ && sender == virtual_keyboard_view_) { |
| + Shell::GetInstance()->metrics()->RecordUserMetricsAction( |
|
Daniel Erat
2014/02/04 22:05:19
this line is indented four spaces further than it
kevers
2014/02/04 22:37:57
Fixed.
|
| + delegate->IsVirtualKeyboardEnabled() ? |
| + ash::UMA_STATUS_AREA_DISABLE_VIRTUAL_KEYBOARD : |
| + ash::UMA_STATUS_AREA_ENABLE_VIRTUAL_KEYBOARD); |
| + delegate->SetVirtualKeyboardEnabled(!delegate->IsVirtualKeyboardEnabled()); |
| } |
| } |