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 9462a66e1a46d873048fa073d18f32896d10b5d1..cb579346e5a5550d44de93ab44600bc5edc9b63a 100644 |
--- a/chrome/browser/ui/ash/ash_init.cc |
+++ b/chrome/browser/ui/ash/ash_init.cc |
@@ -8,6 +8,7 @@ |
#include "ash/ash_switches.h" |
#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 "ash/wm/event_rewriter_event_filter.h" |
#include "ash/wm/property_util.h" |
@@ -84,8 +85,12 @@ void OpenAsh() { |
ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( |
chromeos::accessibility::IsHighContrastEnabled()); |
+ chromeos::accessibility::ScreenMagnifierType magnifier_type = |
+ chromeos::accessibility::GetScreenMagnifierType(); |
ash::Shell::GetInstance()->magnification_controller()->SetEnabled( |
- chromeos::accessibility::IsScreenMagnifierEnabled()); |
+ magnifier_type == chromeos::accessibility::MagnifierFull); |
+ ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled( |
+ magnifier_type == chromeos::accessibility::MagnifierPartial); |
if (!CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kDisableZeroBrowsersOpenForTests)) { |