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

Unified Diff: ash/system/tray_accessibility.cc

Issue 10543158: Do not toggle Applist with Search key press when accessibility is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge similar functions Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: ash/system/tray_accessibility.cc
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index 104174c1a4c1bac4fea64819cc87f075af179797..f5b8900a2e3f6338f238bb8ad6d0ec71c4eeeed8 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,11 @@ TrayAccessibility::TrayAccessibility()
TrayAccessibility::~TrayAccessibility() {}
bool TrayAccessibility::GetInitialVisibility() {
- return ash::Shell::GetInstance()->tray_delegate()->IsInAccessibilityMode();
+ return 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_);

Powered by Google App Engine
This is Rietveld 408576698