| Index: ash/shell/shell_delegate_impl.h
|
| ===================================================================
|
| --- ash/shell/shell_delegate_impl.h (revision 176100)
|
| +++ ash/shell/shell_delegate_impl.h (working copy)
|
| @@ -46,9 +46,7 @@
|
| virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;
|
| virtual void ToggleHighContrast() OVERRIDE;
|
| virtual bool IsHighContrastEnabled() const OVERRIDE;
|
| - virtual void SetMagnifierEnabled(bool enabled) OVERRIDE;
|
| - virtual void SetMagnifierType(MagnifierType type) OVERRIDE;
|
| - virtual bool IsMagnifierEnabled() const OVERRIDE;
|
| + virtual void SetMagnifier(MagnifierType type) OVERRIDE;
|
| virtual MagnifierType GetMagnifierType() const OVERRIDE;
|
| virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE;
|
| virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
|
| @@ -81,7 +79,6 @@
|
| bool locked_;
|
| bool spoken_feedback_enabled_;
|
| bool high_contrast_enabled_;
|
| - bool screen_magnifier_enabled_;
|
| MagnifierType screen_magnifier_type_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
|
|
|