| 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 0f50c6b7c5d41c43b2d7811f07bd56638a01cbb0..ef9d18aac8da618a07326e2a671faee0005624d0 100644
|
| --- a/chrome/browser/ui/ash/ash_init.cc
|
| +++ b/chrome/browser/ui/ash/ash_init.cc
|
| @@ -96,12 +96,14 @@ void OpenAsh() {
|
| chromeos::accessibility::IsHighContrastEnabled());
|
|
|
| DCHECK(chromeos::MagnificationManager::Get());
|
| + bool magnifier_enabled =
|
| + chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
|
| ash::MagnifierType magnifier_type =
|
| chromeos::MagnificationManager::Get()->GetMagnifierType();
|
| - ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
|
| - magnifier_type == ash::MAGNIFIER_FULL);
|
| - ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled(
|
| - magnifier_type == ash::MAGNIFIER_PARTIAL);
|
| + ash::Shell::GetInstance()->magnification_controller()->
|
| + SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL);
|
| + ash::Shell::GetInstance()->partial_magnification_controller()->
|
| + SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);
|
|
|
| if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableZeroBrowsersOpenForTests)) {
|
|
|