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

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

Issue 11642014: Re-introduce the partial magnifier (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index 82784e49cd8d84b0a0b9ea94ce6cfb6697a0d9dd..bc8a8e64bad42578bddf0c9128c36a87378faced 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -149,10 +149,9 @@ void CoreOobeHandler::HandleEnableScreenMagnifier(const base::ListValue* args) {
return;
}
// TODO(nkostylev): Add support for partial screen magnifier.
- ash::MagnifierType type = enabled ? ash::MAGNIFIER_FULL :
- ash::MAGNIFIER_OFF;
DCHECK(MagnificationManager::Get());
- MagnificationManager::Get()->SetMagnifier(type);
+ MagnificationManager::Get()->SetMagnifier(enabled,
+ ash::MAGNIFIER_TYPE_UNCHANGE);
}
void CoreOobeHandler::HandleEnableSpokenFeedback(const base::ListValue* args) {
@@ -173,15 +172,13 @@ void CoreOobeHandler::ShowOobeUI(bool show) {
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",
- type != ash::MAGNIFIER_OFF);
+ MagnificationManager::Get()->IsMagnifierEnabled());
web_ui()->CallJavascriptFunction("cr.ui.Oobe.refreshA11yInfo", a11y_info);
}

Powered by Google App Engine
This is Rietveld 408576698