| Index: ash/shell/shell_delegate_impl.cc
|
| diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
|
| index fde2bd1608146b0b0165328f7e71e464f0409d2d..5a4d8a96089b8914b5cbde2ea4dc29c306c1763f 100644
|
| --- a/ash/shell/shell_delegate_impl.cc
|
| +++ b/ash/shell/shell_delegate_impl.cc
|
| @@ -25,7 +25,8 @@ ShellDelegateImpl::ShellDelegateImpl()
|
| locked_(false),
|
| spoken_feedback_enabled_(false),
|
| high_contrast_enabled_(false),
|
| - screen_magnifier_type_(MAGNIFIER_OFF) {
|
| + screen_magnifier_enabled_(false),
|
| + screen_magnifier_type_(MAGNIFIER_DEFAULT) {
|
| }
|
|
|
| ShellDelegateImpl::~ShellDelegateImpl() {
|
| @@ -134,10 +135,15 @@ bool ShellDelegateImpl::IsHighContrastEnabled() const {
|
| return high_contrast_enabled_;
|
| }
|
|
|
| -void ShellDelegateImpl::SetMagnifier(MagnifierType type) {
|
| +void ShellDelegateImpl::SetMagnifier(bool enabled, MagnifierType type) {
|
| + screen_magnifier_enabled_ = enabled;
|
| screen_magnifier_type_ = type;
|
| }
|
|
|
| +bool ShellDelegateImpl::IsMagnifierEnabled() const {
|
| + return screen_magnifier_enabled_;
|
| +}
|
| +
|
| MagnifierType ShellDelegateImpl::GetMagnifierType() const {
|
| return screen_magnifier_type_;
|
| }
|
|
|