| OLD | NEW |
| 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/common/system/tray_accessibility.h" | 5 #include "ash/common/system/tray_accessibility.h" |
| 6 | 6 |
| 7 #include "ash/common/accessibility_delegate.h" | 7 #include "ash/common/accessibility_delegate.h" |
| 8 #include "ash/common/accessibility_types.h" | 8 #include "ash/common/accessibility_types.h" |
| 9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
| 10 #include "ash/common/system/tray/hover_highlight_view.h" | 10 #include "ash/common/system/tray/hover_highlight_view.h" |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 else if (sender == settings_view_) | 286 else if (sender == settings_view_) |
| 287 tray_delegate->ShowAccessibilitySettings(); | 287 tray_delegate->ShowAccessibilitySettings(); |
| 288 } | 288 } |
| 289 | 289 |
| 290 } // namespace tray | 290 } // namespace tray |
| 291 | 291 |
| 292 //////////////////////////////////////////////////////////////////////////////// | 292 //////////////////////////////////////////////////////////////////////////////// |
| 293 // ash::TrayAccessibility | 293 // ash::TrayAccessibility |
| 294 | 294 |
| 295 TrayAccessibility::TrayAccessibility(SystemTray* system_tray) | 295 TrayAccessibility::TrayAccessibility(SystemTray* system_tray) |
| 296 : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_ACCESSIBILITY), | 296 : TrayImageItem(system_tray, |
| 297 IDR_AURA_UBER_TRAY_ACCESSIBILITY, |
| 298 UMA_ACCESSIBILITY), |
| 297 default_(NULL), | 299 default_(NULL), |
| 298 detailed_popup_(NULL), | 300 detailed_popup_(NULL), |
| 299 detailed_menu_(NULL), | 301 detailed_menu_(NULL), |
| 300 request_popup_view_state_(A11Y_NONE), | 302 request_popup_view_state_(A11Y_NONE), |
| 301 tray_icon_visible_(false), | 303 tray_icon_visible_(false), |
| 302 login_(GetCurrentLoginStatus()), | 304 login_(GetCurrentLoginStatus()), |
| 303 previous_accessibility_state_(GetAccessibilityState()), | 305 previous_accessibility_state_(GetAccessibilityState()), |
| 304 show_a11y_menu_on_lock_screen_(true) { | 306 show_a11y_menu_on_lock_screen_(true) { |
| 305 DCHECK(system_tray); | 307 DCHECK(system_tray); |
| 306 WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this); | 308 WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this); |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 if (detailed_popup_) | 409 if (detailed_popup_) |
| 408 detailed_popup_->GetWidget()->Close(); | 410 detailed_popup_->GetWidget()->Close(); |
| 409 if (detailed_menu_) | 411 if (detailed_menu_) |
| 410 detailed_menu_->GetWidget()->Close(); | 412 detailed_menu_->GetWidget()->Close(); |
| 411 } | 413 } |
| 412 | 414 |
| 413 previous_accessibility_state_ = accessibility_state; | 415 previous_accessibility_state_ = accessibility_state; |
| 414 } | 416 } |
| 415 | 417 |
| 416 } // namespace ash | 418 } // namespace ash |
| OLD | NEW |