Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2985)

Unified Diff: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

Issue 11821053: Revert 176087 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698