diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 03:29:38 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 03:29:38 +0000 |
| commit | f3ab6eff57d03d6b363dc554b4cb0d40ad448c75 (patch) | |
| tree | 5f66f165718dde57b0b64cda871348f1f568d1c1 /ash/magnifier | |
| parent | c6b8bb4dd012ec030eef1730c214167c3809af92 (diff) | |
| download | chromium_src-f3ab6eff57d03d6b363dc554b4cb0d40ad448c75.zip chromium_src-f3ab6eff57d03d6b363dc554b4cb0d40ad448c75.tar.gz chromium_src-f3ab6eff57d03d6b363dc554b4cb0d40ad448c75.tar.bz2 | |
Introduce AccessibiltyDelegate
I'll incorporate changes in https://codereview.chromium.org/27238008 when it's landed.
BUG=none
Review URL: https://codereview.chromium.org/37663004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index c2e269d..c6a6a52 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -4,9 +4,9 @@ #include "ash/magnifier/magnification_controller.h" +#include "ash/accessibility_delegate.h" #include "ash/display/root_window_transformers.h" #include "ash/shell.h" -#include "ash/shell_delegate.h" #include "ash/system/tray/system_tray_delegate.h" #include "base/synchronization/waitable_event.h" #include "ui/aura/client/cursor_client.h" @@ -503,7 +503,8 @@ void MagnificationControllerImpl::SetScale(float scale, bool animate) { return; ValidateScale(&scale); - ash::Shell::GetInstance()->delegate()->SaveScreenMagnifierScale(scale); + ash::Shell::GetInstance()->accessibility_delegate()-> + SaveScreenMagnifierScale(scale); RedrawKeepingMousePosition(scale, animate); } @@ -543,7 +544,8 @@ void MagnificationControllerImpl::EnsurePointIsVisible( void MagnificationControllerImpl::SetEnabled(bool enabled) { if (enabled) { float scale = - ash::Shell::GetInstance()->delegate()->GetSavedScreenMagnifierScale(); + ash::Shell::GetInstance()->accessibility_delegate()-> + GetSavedScreenMagnifierScale(); if (scale <= 0.0f) scale = kInitialMagnifiedScale; ValidateScale(&scale); @@ -554,7 +556,8 @@ void MagnificationControllerImpl::SetEnabled(bool enabled) { is_enabled_ = enabled; RedrawKeepingMousePosition(scale, true); - ash::Shell::GetInstance()->delegate()->SaveScreenMagnifierScale(scale); + ash::Shell::GetInstance()->accessibility_delegate()-> + SaveScreenMagnifierScale(scale); } else { // Do nothing, if already disabled. if (!is_enabled_) |