diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 16:37:08 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 16:37:08 +0000 |
| commit | 24b2b518b1deb85966bf5e16cf0969b8e7af0b99 (patch) | |
| tree | ad5a68e2021d7457e832061510d357b386b9ba84 /ash/magnifier | |
| parent | 5b15e13c68d8ca8165698d50410557f44b012b31 (diff) | |
| download | chromium_src-24b2b518b1deb85966bf5e16cf0969b8e7af0b99.zip chromium_src-24b2b518b1deb85966bf5e16cf0969b8e7af0b99.tar.gz chromium_src-24b2b518b1deb85966bf5e16cf0969b8e7af0b99.tar.bz2 | |
Full Screen Magnifier: Add MagnificationManager
MagnificationManager controls the full screen magnifier from chrome-browser side (not ash side. Note that MagnificationController is on ash side).
MagnificationManager does:
- Watch logged-in. Change the behavior between the login screen and user desktop.
- Watch change of the pref. When the pref changes, the setting of the magnifier will interlock with it.
In addition, this patch make the magnifier settings per-user instead of per-device.
BUG=151891
TEST=manual, browser_test passes.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162080
Review URL: https://chromiumcodereview.appspot.com/11065008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 1 | ||||
| -rw-r--r-- | ash/magnifier/magnification_controller.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index ce5e4fe..60f4a39 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -48,6 +48,7 @@ class MagnificationControllerImpl : virtual public MagnificationController, // MagnificationController overrides: virtual void SetEnabled(bool enabled) OVERRIDE; + virtual bool IsEnabled() OVERRIDE { return is_enabled_; } virtual void SetScale(float scale, bool animate) OVERRIDE; virtual float GetScale() const OVERRIDE { return scale_; } virtual void MoveWindow(int x, int y, bool animate) OVERRIDE; diff --git a/ash/magnifier/magnification_controller.h b/ash/magnifier/magnification_controller.h index 4b0e865..3edc586 100644 --- a/ash/magnifier/magnification_controller.h +++ b/ash/magnifier/magnification_controller.h @@ -30,6 +30,9 @@ class MagnificationController { // Enables (or disables if |enabled| is false) screen magnifier feature. virtual void SetEnabled(bool enabled) = 0; + // Returns if the screen magnifier is enabled or not. + virtual bool IsEnabled() = 0; + // Sets the magnification ratio. 1.0f means no magnification. virtual void SetScale(float scale, bool animate) = 0; // Returns the current magnification ratio. |