| 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 f93747d540e9d1638db63379cbb5839145c9eea1..88ae7e7fbbd9385dff15ddba76f3fc1c237172b5 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| @@ -354,6 +354,15 @@ 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());
|
| @@ -363,10 +372,10 @@ ash::MagnifierType ChromeShellDelegate::GetMagnifierType() const {
|
| #endif
|
| }
|
|
|
| -void ChromeShellDelegate::SetMagnifier(ash::MagnifierType type) {
|
| +void ChromeShellDelegate::SetMagnifier(bool enabled, ash::MagnifierType type) {
|
| #if defined(OS_CHROMEOS)
|
| DCHECK(chromeos::MagnificationManager::Get());
|
| - return chromeos::MagnificationManager::Get()->SetMagnifier(type);
|
| + return chromeos::MagnificationManager::Get()->SetMagnifier(enabled, type);
|
| #endif
|
| }
|
|
|
|
|