Add the partial screen magnifier to Chrome OS.

chrome/browser/chromeos/accessibility/accessibility_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 
 #include <queue>
 
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
+#include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 145 matching lines @@
 void EnableHighContrast(bool enabled) {
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kHighContrastEnabled, enabled);
   pref_service->CommitPendingWrite();
 
 #if defined(USE_ASH)
   ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(enabled);
 #endif
 }
 
-void EnableScreenMagnifier(bool enabled) {
+void SetScreenMagnifier(ScreenMagnifierType type) {
   PrefService* pref_service = g_browser_process->local_state();
-  pref_service->SetBoolean(prefs::kScreenMagnifierEnabled, enabled);
+  pref_service->SetBoolean(prefs::kScreenMagnifierEnabled,
+                           type == MagnifierFull);
+  pref_service->SetBoolean(prefs::kPartialScreenMagnifierEnabled,
+                           type == MagnifierPartial);
   pref_service->CommitPendingWrite();
 
 #if defined(USE_ASH)
-  ash::Shell::GetInstance()->magnification_controller()->SetEnabled(enabled);
+  ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
+      type == MagnifierFull);
+  ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled(
+      type == MagnifierPartial);
 #endif
 }
 
 void EnableVirtualKeyboard(bool enabled) {
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kVirtualKeyboardEnabled, enabled);
   pref_service->CommitPendingWrite();
 }
 
 void ToggleSpokenFeedback(content::WebUI* login_web_ui) {
@@ skipping 32 matching lines @@
 bool IsHighContrastEnabled() {
   if (!g_browser_process) {
     return false;
   }
   PrefService* prefs = g_browser_process->local_state();
   bool high_contrast_enabled = prefs &&
       prefs->GetBoolean(prefs::kHighContrastEnabled);
   return high_contrast_enabled;
 }
 
-bool IsScreenMagnifierEnabled() {
+ScreenMagnifierType GetScreenMagnifierType() {
   if (!g_browser_process) {
-    return false;
+    return MagnifierNone;
   }

[oshima, 2012/09/13 16:35:31]

nuke {}

[Zachary Kuznia, 2012/10/09 09:02:36]

Done.

   PrefService* prefs = g_browser_process->local_state();
-  bool enabled = prefs && prefs->GetBoolean(prefs::kScreenMagnifierEnabled);
-  return enabled;
+  if (!prefs)
+    return MagnifierNone;
+
+  if (prefs->GetBoolean(prefs::kScreenMagnifierEnabled))
+    return MagnifierFull;
+  else if (prefs->GetBoolean(prefs::kPartialScreenMagnifierEnabled))
+    return MagnifierPartial;
+  else
+    return MagnifierNone;
 }
 
 void MaybeSpeak(const std::string& utterance) {
   if (IsSpokenFeedbackEnabled())
     Speak(utterance);
 }
 
 }  // namespace accessibility
 }  // namespace chromeos