diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 16:46:31 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 16:46:31 +0000 |
| commit | d830c09a119ef8fdb996c54cf7dc27696a12c637 (patch) | |
| tree | d4abc30652914395b10a77ab494b6a00957b7dbc /ash/shell/shell_delegate_impl.h | |
| parent | 5c4ac80fa18fddb045a69c6e02641b9f623e138a (diff) | |
| download | chromium_src-d830c09a119ef8fdb996c54cf7dc27696a12c637.zip chromium_src-d830c09a119ef8fdb996c54cf7dc27696a12c637.tar.gz chromium_src-d830c09a119ef8fdb996c54cf7dc27696a12c637.tar.bz2 | |
Revert 176087
Appears to break ChromeOS browser_tests.
> Re-introduce the partial magnifier
>
> Major Changes:
> - Adding a selectbox at the right of screen magnifier setting on the setting page.
> - Adding 'screen_magnifier_type2' pref.
> - Separating the enable/disable state of magnifier from MagnifierType. MagnifierType does no longer indicate the current enable/disable status.
> - Add IsMagnifierEnabled() to shell delegate.
>
> BUG=166832
> TEST=confirm that magnifier can be enabled/disabled via the tray and the settings page. browser_test passes.
>
> R=zork@chromium.org, derat@chromium.org, nkostylev@chromium.org
> TBR=jhawkins@chromium.org
> # TBRing for small changed in C/B/ui/webui/options/ and C/B/resources/options/
>
> Review URL: https://chromiumcodereview.appspot.com/11642014
TBR=yoshiki@chromium.org
Review URL: https://codereview.chromium.org/11821053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_delegate_impl.h')
| -rw-r--r-- | ash/shell/shell_delegate_impl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index e94d08a..3a987e2 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h @@ -46,9 +46,7 @@ class ShellDelegateImpl : public ash::ShellDelegate { 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 @@ class ShellDelegateImpl : public ash::ShellDelegate { bool locked_; bool spoken_feedback_enabled_; bool high_contrast_enabled_; - bool screen_magnifier_enabled_; MagnifierType screen_magnifier_type_; DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); |