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

1 files changed, 8 insertions, 2 deletions

diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index bdd3958..6a9dd08 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -149,8 +149,14 @@ class ASH_EXPORT ShellDelegate {
   // Returns true if high contrast mode is enabled.
   virtual bool IsHighContrastEnabled() const = 0;
 
-  // Invoked to change the mode of the screen magnifier.
-  virtual void SetMagnifier(MagnifierType type) = 0;
+  // Invoked to enable the screen magnifier.
+  virtual void SetMagnifierEnabled(bool enabled) = 0;
+
+  // Invoked to change the type of the screen magnifier.
+  virtual void SetMagnifierType(MagnifierType type) = 0;
+
+  // Returns if the screen magnifier is enabled or not.
+  virtual bool IsMagnifierEnabled() const = 0;
 
   // Returns the current screen magnifier mode.
   virtual MagnifierType GetMagnifierType() const = 0;