| Index: ash/default_accessibility_delegate.h
|
| diff --git a/ash/default_accessibility_delegate.h b/ash/default_accessibility_delegate.h
|
| index a9604b7b336514155d82f405dd7b48b133c75611..5680fc01e16a036482eabf803634d2d6e789bae6 100644
|
| --- a/ash/default_accessibility_delegate.h
|
| +++ b/ash/default_accessibility_delegate.h
|
| @@ -21,9 +21,9 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
|
| void ToggleHighContrast() override;
|
| bool IsHighContrastEnabled() const override;
|
| void SetMagnifierEnabled(bool enabled) override;
|
| - void SetMagnifierType(MagnifierType type) override;
|
| + void SetMagnifierType(ui::MagnifierType type) override;
|
| bool IsMagnifierEnabled() const override;
|
| - MagnifierType GetMagnifierType() const override;
|
| + ui::MagnifierType GetMagnifierType() const override;
|
| void SetLargeCursorEnabled(bool enabled) override;
|
| bool IsLargeCursorEnabled() const override;
|
| void SetAutoclickEnabled(bool enabled) override;
|
| @@ -34,11 +34,11 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
|
| bool IsBrailleDisplayConnected() const override;
|
| void SilenceSpokenFeedback() const override;
|
| void ToggleSpokenFeedback(
|
| - AccessibilityNotificationVisibility notify) override;
|
| + ui::AccessibilityNotificationVisibility notify) override;
|
| void SaveScreenMagnifierScale(double scale) override;
|
| double GetSavedScreenMagnifierScale() override;
|
| - void TriggerAccessibilityAlert(AccessibilityAlert alert) override;
|
| - AccessibilityAlert GetLastAccessibilityAlert() override;
|
| + void TriggerAccessibilityAlert(ui::AccessibilityAlert alert) override;
|
| + ui::AccessibilityAlert GetLastAccessibilityAlert() override;
|
| void PlayEarcon(int sound_key) override;
|
| base::TimeDelta PlayShutdownSound() const override;
|
|
|
| @@ -46,11 +46,11 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
|
| bool spoken_feedback_enabled_;
|
| bool high_contrast_enabled_;
|
| bool screen_magnifier_enabled_;
|
| - MagnifierType screen_magnifier_type_;
|
| + ui::MagnifierType screen_magnifier_type_;
|
| bool large_cursor_enabled_;
|
| bool autoclick_enabled_;
|
| bool virtual_keyboard_enabled_;
|
| - AccessibilityAlert accessibility_alert_;
|
| + ui::AccessibilityAlert accessibility_alert_;
|
| DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityDelegate);
|
| };
|
|
|
|
|