| Index: ash/common/default_accessibility_delegate.h
|
| diff --git a/ash/common/default_accessibility_delegate.h b/ash/common/default_accessibility_delegate.h
|
| index b12a33a644c175090d4cff3844794d3728b758e3..7fbc94a799741adcf836f13988115524cf830319 100644
|
| --- a/ash/common/default_accessibility_delegate.h
|
| +++ b/ash/common/default_accessibility_delegate.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "ash/ash_export.h"
|
| #include "ash/common/accessibility_delegate.h"
|
| +#include "ash/common/accessibility_types.h"
|
| #include "base/macros.h"
|
|
|
| namespace ash {
|
| @@ -20,9 +21,9 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
|
| void ToggleHighContrast() override;
|
| bool IsHighContrastEnabled() const override;
|
| void SetMagnifierEnabled(bool enabled) override;
|
| - void SetMagnifierType(ui::MagnifierType type) override;
|
| + void SetMagnifierType(MagnifierType type) override;
|
| bool IsMagnifierEnabled() const override;
|
| - ui::MagnifierType GetMagnifierType() const override;
|
| + MagnifierType GetMagnifierType() const override;
|
| void SetLargeCursorEnabled(bool enabled) override;
|
| bool IsLargeCursorEnabled() const override;
|
| void SetAutoclickEnabled(bool enabled) override;
|
| @@ -45,11 +46,11 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
|
| bool IsBrailleDisplayConnected() const override;
|
| void SilenceSpokenFeedback() const override;
|
| void ToggleSpokenFeedback(
|
| - ui::AccessibilityNotificationVisibility notify) override;
|
| + AccessibilityNotificationVisibility notify) override;
|
| void SaveScreenMagnifierScale(double scale) override;
|
| double GetSavedScreenMagnifierScale() override;
|
| - void TriggerAccessibilityAlert(ui::AccessibilityAlert alert) override;
|
| - ui::AccessibilityAlert GetLastAccessibilityAlert() override;
|
| + void TriggerAccessibilityAlert(AccessibilityAlert alert) override;
|
| + AccessibilityAlert GetLastAccessibilityAlert() override;
|
| void PlayEarcon(int sound_key) override;
|
| base::TimeDelta PlayShutdownSound() const override;
|
| void HandleAccessibilityGesture(ui::AXGesture gesture) override;
|
| @@ -58,7 +59,7 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
|
| bool spoken_feedback_enabled_ = false;
|
| bool high_contrast_enabled_ = false;
|
| bool screen_magnifier_enabled_ = false;
|
| - ui::MagnifierType screen_magnifier_type_ = ui::kDefaultMagnifierType;
|
| + MagnifierType screen_magnifier_type_ = kDefaultMagnifierType;
|
| bool large_cursor_enabled_ = false;
|
| bool autoclick_enabled_ = false;
|
| bool virtual_keyboard_enabled_ = false;
|
| @@ -68,7 +69,7 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
|
| bool focus_highligh_enabled_ = false;
|
| bool select_to_speak_enabled_ = false;
|
| bool switch_access_enabled_ = false;
|
| - ui::AccessibilityAlert accessibility_alert_ = ui::A11Y_ALERT_NONE;
|
| + AccessibilityAlert accessibility_alert_ = A11Y_ALERT_NONE;
|
| DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityDelegate);
|
| };
|
|
|
|
|