Magnifier: Prevent useless operation in enabling/disabling magnifier.

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"
@@ skipping 193 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 SetMagnifier(ash::MagnifierType type) {
-  if (MagnificationManager::GetInstance())
-    MagnificationManager::GetInstance()->SetMagnifier(type);
+  if (MagnificationManager::Get())
+    MagnificationManager::Get()->SetMagnifier(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 42 matching lines @@
   if (!g_browser_process) {
     return false;
   }
   PrefService* prefs = g_browser_process->local_state();
   bool virtual_keyboard_enabled = prefs &&
       prefs->GetBoolean(prefs::kVirtualKeyboardEnabled);
   return virtual_keyboard_enabled;
 }
 
 ash::MagnifierType GetMagnifierType() {
-  if (!MagnificationManager::GetInstance())
+  if (!MagnificationManager::Get())
     return ash::MAGNIFIER_OFF;
-  return MagnificationManager::GetInstance()->GetMagnifierType();
+  return MagnificationManager::Get()->GetMagnifierType();
 }
 
 ash::MagnifierType MagnifierTypeFromName(const char type_name[]) {
   if (0 == strcmp(type_name, kScreenMagnifierFull))
     return ash::MAGNIFIER_FULL;
   else if (0 == strcmp(type_name, kScreenMagnifierPartial))
     return ash::MAGNIFIER_PARTIAL;
   else
     return ash::MAGNIFIER_OFF;
 }
@@ skipping 14 matching lines @@
   if (IsSpokenFeedbackEnabled())
     Speak(utterance);
 }
 
 void ShowAccessibilityHelp(Browser* browser) {
   chrome::ShowSingletonTab(browser, GURL(chrome::kChromeAccessibilityHelpURL));
 }
 
 }  // namespace accessibility
 }  // namespace chromeos