diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 18:26:41 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 18:26:41 +0000 |
| commit | 7585f4c1d82faf9ed8978e90162b7386d473ecc1 (patch) | |
| tree | 51bc618b7efff79f1159542484a9cce2e8761c2f /ash/magnifier | |
| parent | 22d5b982b89ed916375957a5f05e29c8eeb6fbbd (diff) | |
| download | chromium_src-7585f4c1d82faf9ed8978e90162b7386d473ecc1.zip chromium_src-7585f4c1d82faf9ed8978e90162b7386d473ecc1.tar.gz chromium_src-7585f4c1d82faf9ed8978e90162b7386d473ecc1.tar.bz2 | |
Revert 176102
The revert didn't fix the ChromeOS failures so I'm restoring the change.
> 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
TBR=acolwell@chromium.org
Review URL: https://codereview.chromium.org/11783097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnifier_constants.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ash/magnifier/magnifier_constants.h b/ash/magnifier/magnifier_constants.h index 4ca4c89..aa7cac7 100644 --- a/ash/magnifier/magnifier_constants.h +++ b/ash/magnifier/magnifier_constants.h @@ -7,12 +7,16 @@ namespace ash { +// Note: Do not change these values; UMA and prefs depend on them. enum MagnifierType { - MAGNIFIER_OFF, - MAGNIFIER_FULL, - MAGNIFIER_PARTIAL, + MAGNIFIER_FULL = 1, + MAGNIFIER_PARTIAL = 2, }; +const int kMaxMagnifierType = 2; + +const MagnifierType kDefaultMagnifierType = MAGNIFIER_FULL; + } // namespace ash #endif // ASH_MAGNIFIER_MAGNIFIER_CONSTANTS_H_ |