| Index: ash/test/test_shell_delegate.cc
|
| diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
|
| index f782c868e784258fb62012070f11628a32f1c497..b459d8216e84ec41ea439d871c904ca33dba5565 100644
|
| --- a/ash/test/test_shell_delegate.cc
|
| +++ b/ash/test/test_shell_delegate.cc
|
| @@ -24,7 +24,8 @@ TestShellDelegate::TestShellDelegate()
|
| session_started_(true),
|
| spoken_feedback_enabled_(false),
|
| high_contrast_enabled_(false),
|
| - screen_magnifier_type_(MAGNIFIER_OFF),
|
| + screen_magnifier_enabled_(false),
|
| + screen_magnifier_type_(MAGNIFIER_DEFAULT),
|
| user_logged_in_(true),
|
| can_lock_screen_(true),
|
| num_exit_requests_(0) {
|
| @@ -124,10 +125,15 @@ bool TestShellDelegate::IsHighContrastEnabled() const {
|
| return high_contrast_enabled_;
|
| }
|
|
|
| -void TestShellDelegate::SetMagnifier(const MagnifierType type) {
|
| +void TestShellDelegate::SetMagnifier(bool enabled, const MagnifierType type) {
|
| + screen_magnifier_enabled_ = enabled;
|
| screen_magnifier_type_ = type;
|
| }
|
|
|
| +bool TestShellDelegate::IsMagnifierEnabled() const {
|
| + return screen_magnifier_enabled_;
|
| +}
|
| +
|
| MagnifierType TestShellDelegate::GetMagnifierType() const {
|
| return screen_magnifier_type_;
|
| }
|
|
|