| Index: chrome/browser/ui/ash/ash_init.cc
|
| diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
|
| index f6a482ffec7d7a8f17370116093a0af2172cf2c6..8551ef498399e59be8a2f933574f5a84848690b7 100644
|
| --- a/chrome/browser/ui/ash/ash_init.cc
|
| +++ b/chrome/browser/ui/ash/ash_init.cc
|
| @@ -65,7 +65,7 @@ void OpenAsh() {
|
| #if defined(OS_CHROMEOS)
|
| shell->accelerator_controller()->SetImeControlDelegate(
|
| scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass());
|
| - ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(
|
| + shell->high_contrast_controller()->SetEnabled(
|
| chromeos::AccessibilityManager::Get()->IsHighContrastEnabled());
|
|
|
| DCHECK(chromeos::MagnificationManager::Get());
|
| @@ -73,9 +73,9 @@ void OpenAsh() {
|
| chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
|
| ash::MagnifierType magnifier_type =
|
| chromeos::MagnificationManager::Get()->GetMagnifierType();
|
| - ash::Shell::GetInstance()->magnification_controller()->
|
| + shell->magnification_controller()->
|
| SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL);
|
| - ash::Shell::GetInstance()->partial_magnification_controller()->
|
| + shell->partial_magnification_controller()->
|
| SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);
|
|
|
| if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
|
|