Do not toggle Applist with Search key press when accessibility is enabled.

BUG=132296
TEST=manual + aura_shell_unittests


Review URL: https://chromiumcodereview.appspot.com/10543158

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142590 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 16 deletions

diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index b3eb72f..6d78f47 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -115,12 +115,6 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
     caps_lock_enabled_ = enabled;
   }
 
-  virtual bool IsInAccessibilityMode() const OVERRIDE {
-    return false;
-  }
-
-  virtual void SetEnableSpokenFeedback(bool enable) OVERRIDE {}
-
   virtual void ShutDown() OVERRIDE {}
 
   virtual void SignOut() OVERRIDE {
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index 4c73d32..9efebbf 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -161,12 +161,6 @@ class SystemTrayDelegate {
   // Sets the caps lock status to |enabled|.
   virtual void SetCapsLockEnabled(bool enabled) = 0;
 
-  // Gets whether accessibility mode is turned on.
-  virtual bool IsInAccessibilityMode() const = 0;
-
-  // Enables or disables spoken feedback.
-  virtual void SetEnableSpokenFeedback(bool enable) = 0;
-
   // Attempts to shut down the system.
   virtual void ShutDown() = 0;
 
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index 104174c..bb9c8f2 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_);