Full Screen Magnifier: Add MagnificationManager

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/chromeos/accessibility/magnification_manager.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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_controller.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::RenderViewHost;
 
-namespace {
-const char kScreenMagnifierOff[] = "";
-const char kScreenMagnifierFull[] = "full";
-const char kScreenMagnifierPartial[] = "partial";
-}
-
-
 namespace chromeos {
 namespace accessibility {
 
+const char kScreenMagnifierOff[] = "";
+const char kScreenMagnifierFull[] = "full";
+const char kScreenMagnifierPartial[] = "partial";
+
 // Helper class that directly loads an extension's content scripts into
 // all of the frames corresponding to a given RenderViewHost.
 class ContentScriptLoader {
  public:
   // Initialize the ContentScriptLoader with the ID of the extension
   // and the RenderViewHost where the scripts should be loaded.
   ContentScriptLoader(const std::string& extension_id,
                       int render_process_id,
                       int render_view_id)
       : extension_id_(extension_id),
@@ skipping 126 matching lines @@
   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 SetScreenMagnifier(ScreenMagnifierType type) {
-  PrefService* pref_service = g_browser_process->local_state();
-  pref_service->SetString(prefs::kScreenMagnifierType,
-                          ScreenMagnifierNameFromType(type));
-  pref_service->CommitPendingWrite();
-
-#if defined(USE_ASH)
-  ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
-      type == MAGNIFIER_FULL);
-  ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled(
-      type == MAGNIFIER_PARTIAL);
-#endif
+  if (MagnificationManager::GetInstance())
+    MagnificationManager::GetInstance()->SetScreenMagnifier(type);
 }
 
 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) {
   bool spoken_feedback_enabled = g_browser_process &&
@@ skipping 32 matching lines @@
   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;
 }
 
 ScreenMagnifierType GetScreenMagnifierType() {
-  if (!g_browser_process)
+  if (!MagnificationManager::GetInstance())
     return MAGNIFIER_OFF;
-
-  PrefService* prefs = g_browser_process->local_state();
-  std::string screen_magnifier_type;
-  if (!prefs)
-    return MAGNIFIER_OFF;
-
-  return ScreenMagnifierTypeFromName(
-      prefs->GetString(prefs::kScreenMagnifierType).c_str());
+  return MagnificationManager::GetInstance()->GetScreenMagnifierType();
 }
 
 ScreenMagnifierType ScreenMagnifierTypeFromName(const char type_name[]) {
   if (0 == strcmp(type_name, kScreenMagnifierFull))
     return MAGNIFIER_FULL;
   else if (0 == strcmp(type_name, kScreenMagnifierPartial))
     return MAGNIFIER_PARTIAL;
   else
     return MAGNIFIER_OFF;
 }
@@ skipping 10 matching lines @@
   return kScreenMagnifierOff;
 }
 
 void MaybeSpeak(const std::string& utterance) {
   if (IsSpokenFeedbackEnabled())
     Speak(utterance);
 }
 
 }  // namespace accessibility
 }  // namespace chromeos