Index: ash/accessibility_delegate.h |
diff --git a/ash/accessibility_delegate.h b/ash/accessibility_delegate.h |
index 410ea7a2590777725322a0a3ce566975a7271b33..8e7e286e4d72174c7ecbde01f7580328edbe92ec 100644 |
--- a/ash/accessibility_delegate.h |
+++ b/ash/accessibility_delegate.h |
@@ -6,22 +6,11 @@ |
#define ASH_ACCESSIBILITY_DELEGATE_H_ |
#include "ash/ash_export.h" |
-#include "ash/magnifier/magnifier_constants.h" |
#include "base/time/time.h" |
+#include "ui/chromeos/accessibility_types.h" |
namespace ash { |
-enum AccessibilityNotificationVisibility { |
- A11Y_NOTIFICATION_NONE, |
- A11Y_NOTIFICATION_SHOW, |
-}; |
- |
-enum AccessibilityAlert { |
- A11Y_ALERT_NONE, |
- A11Y_ALERT_WINDOW_NEEDED, |
- A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED |
-}; |
- |
// A delegate class to control and query accessibility features. |
class ASH_EXPORT AccessibilityDelegate { |
public: |
@@ -29,7 +18,7 @@ class ASH_EXPORT AccessibilityDelegate { |
// Invoked to toggle spoken feedback for accessibility |
virtual void ToggleSpokenFeedback( |
- AccessibilityNotificationVisibility notify) = 0; |
+ ui::AccessibilityNotificationVisibility notify) = 0; |
// Returns true if spoken feedback is enabled. |
virtual bool IsSpokenFeedbackEnabled() const = 0; |
@@ -44,13 +33,13 @@ class ASH_EXPORT AccessibilityDelegate { |
virtual void SetMagnifierEnabled(bool enabled) = 0; |
// Invoked to change the type of the screen magnifier. |
- virtual void SetMagnifierType(MagnifierType type) = 0; |
+ virtual void SetMagnifierType(ui::MagnifierType type) = 0; |
// Returns true if the screen magnifier is enabled. |
virtual bool IsMagnifierEnabled() const = 0; |
// Returns the current screen magnifier mode. |
- virtual MagnifierType GetMagnifierType() const = 0; |
+ virtual ui::MagnifierType GetMagnifierType() const = 0; |
// Invoked to enable Large Cursor. |
virtual void SetLargeCursorEnabled(bool enabled) = 0; |
@@ -87,10 +76,10 @@ class ASH_EXPORT AccessibilityDelegate { |
virtual double GetSavedScreenMagnifierScale() = 0; |
// Triggers an accessibility alert to give the user feedback. |
- virtual void TriggerAccessibilityAlert(AccessibilityAlert alert) = 0; |
+ virtual void TriggerAccessibilityAlert(ui::AccessibilityAlert alert) = 0; |
// Gets the last accessibility alert that was triggered. |
- virtual AccessibilityAlert GetLastAccessibilityAlert() = 0; |
+ virtual ui::AccessibilityAlert GetLastAccessibilityAlert() = 0; |
// Plays an earcon. Earcons are brief and distinctive sounds that indicate |
// when their mapped event has occurred. The sound key enums can be found in |