| Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| index 5354516aab6959bb51d2f9435f1433ea93c89cf5..b784036259380a3ed6dcfb974b65e7109626a2ad 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| @@ -355,19 +355,35 @@ void ChromeShellDelegate::ToggleHighContrast() {
|
| #endif
|
| }
|
|
|
| +bool ChromeShellDelegate::IsMagnifierEnabled() const {
|
| +#if defined(OS_CHROMEOS)
|
| + DCHECK(chromeos::MagnificationManager::Get());
|
| + return chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
|
| +#else
|
| + return false;
|
| +#endif
|
| +}
|
| +
|
| ash::MagnifierType ChromeShellDelegate::GetMagnifierType() const {
|
| #if defined(OS_CHROMEOS)
|
| DCHECK(chromeos::MagnificationManager::Get());
|
| return chromeos::MagnificationManager::Get()->GetMagnifierType();
|
| #else
|
| - return ash::MAGNIFIER_OFF;
|
| + return ash::kDefaultMagnifierType;
|
| +#endif
|
| +}
|
| +
|
| +void ChromeShellDelegate::SetMagnifierEnabled(bool enabled) {
|
| +#if defined(OS_CHROMEOS)
|
| + DCHECK(chromeos::MagnificationManager::Get());
|
| + return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled);
|
| #endif
|
| }
|
|
|
| -void ChromeShellDelegate::SetMagnifier(ash::MagnifierType type) {
|
| +void ChromeShellDelegate::SetMagnifierType(ash::MagnifierType type) {
|
| #if defined(OS_CHROMEOS)
|
| DCHECK(chromeos::MagnificationManager::Get());
|
| - return chromeos::MagnificationManager::Get()->SetMagnifier(type);
|
| + return chromeos::MagnificationManager::Get()->SetMagnifierType(type);
|
| #endif
|
| }
|
|
|
|
|