| Index: ash/system/tray_accessibility.cc
|
| diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
|
| index 104174c1a4c1bac4fea64819cc87f075af179797..bb9c8f285a20dbe05c7891c82987057426f3be2f 100644
|
| --- a/ash/system/tray_accessibility.cc
|
| +++ b/ash/system/tray_accessibility.cc
|
| @@ -5,7 +5,7 @@
|
| #include "ash/system/tray_accessibility.h"
|
|
|
| #include "ash/shell.h"
|
| -#include "ash/system/tray/system_tray_delegate.h"
|
| +#include "ash/shell_delegate.h"
|
| #include "ash/system/tray/tray_constants.h"
|
| #include "ash/system/tray/tray_views.h"
|
| #include "grit/ash_strings.h"
|
| @@ -46,7 +46,8 @@ class DefaultAccessibilityView : public ActionableView {
|
| protected:
|
| // Overridden from ActionableView.
|
| virtual bool PerformAction(const views::Event& event) OVERRIDE {
|
| - ash::Shell::GetInstance()->tray_delegate()->SetEnableSpokenFeedback(false);
|
| + if (Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled())
|
| + Shell::GetInstance()->delegate()->ToggleSpokenFeedback();
|
| GetWidget()->Close();
|
| return true;
|
| }
|
| @@ -66,11 +67,12 @@ TrayAccessibility::TrayAccessibility()
|
| TrayAccessibility::~TrayAccessibility() {}
|
|
|
| bool TrayAccessibility::GetInitialVisibility() {
|
| - return ash::Shell::GetInstance()->tray_delegate()->IsInAccessibilityMode();
|
| + return Shell::GetInstance()->delegate() &&
|
| + Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled();
|
| }
|
|
|
| views::View* TrayAccessibility::CreateDefaultView(user::LoginStatus status) {
|
| - if (!ash::Shell::GetInstance()->tray_delegate()->IsInAccessibilityMode())
|
| + if (!Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled())
|
| return NULL;
|
|
|
| DCHECK(string_id_);
|
|
|