Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc |
=================================================================== |
--- chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc (revision 176100) |
+++ chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc (working copy) |
@@ -149,8 +149,10 @@ |
return; |
} |
// TODO(nkostylev): Add support for partial screen magnifier. |
+ ash::MagnifierType type = enabled ? ash::MAGNIFIER_FULL : |
+ ash::MAGNIFIER_OFF; |
DCHECK(MagnificationManager::Get()); |
- MagnificationManager::Get()->SetMagnifierEnabled(enabled); |
+ MagnificationManager::Get()->SetMagnifier(type); |
} |
void CoreOobeHandler::HandleEnableSpokenFeedback(const base::ListValue* args) { |
@@ -171,13 +173,15 @@ |
void CoreOobeHandler::UpdateA11yState() { |
DCHECK(MagnificationManager::Get()); |
+ ash::MagnifierType type = MagnificationManager::Get()->GetMagnifierType(); |
+ |
base::DictionaryValue a11y_info; |
a11y_info.SetBoolean("highContrastEnabled", |
accessibility::IsHighContrastEnabled()); |
a11y_info.SetBoolean("spokenFeedbackEnabled", |
accessibility::IsSpokenFeedbackEnabled()); |
a11y_info.SetBoolean("screenMagnifierEnabled", |
- MagnificationManager::Get()->IsMagnifierEnabled()); |
+ type != ash::MAGNIFIER_OFF); |
web_ui()->CallJavascriptFunction("cr.ui.Oobe.refreshA11yInfo", a11y_info); |
} |