Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: ash/magnifier/magnification_controller.cc

Issue 2154523002: Move AccessibilityDelegate ownership to ash::WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setmediadelegate
Patch Set: fix mash_unittests Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/magnification_controller.cc
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index a0fc54a74b5d0802552a606fbaf05d6b134cd3fa..6573dbf04bbdb12403b5e170938f3816a744b119 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -565,7 +565,7 @@ void MagnificationControllerImpl::SetScale(float scale, bool animate) {
return;
ValidateScale(&scale);
- WmShell::Get()->GetAccessibilityDelegate()->SaveScreenMagnifierScale(scale);
+ WmShell::Get()->accessibility_delegate()->SaveScreenMagnifierScale(scale);
RedrawKeepingMousePosition(scale, animate);
}
@@ -598,7 +598,7 @@ void MagnificationControllerImpl::SetEnabled(bool enabled) {
WmShell* wm_shell = WmShell::Get();
float scale =
- wm_shell->GetAccessibilityDelegate()->GetSavedScreenMagnifierScale();
+ wm_shell->accessibility_delegate()->GetSavedScreenMagnifierScale();
if (scale <= 0.0f)
scale = kInitialMagnifiedScale;
ValidateScale(&scale);
@@ -609,7 +609,7 @@ void MagnificationControllerImpl::SetEnabled(bool enabled) {
is_enabled_ = enabled;
RedrawKeepingMousePosition(scale, true);
- wm_shell->GetAccessibilityDelegate()->SaveScreenMagnifierScale(scale);
+ wm_shell->accessibility_delegate()->SaveScreenMagnifierScale(scale);
} else {
// Do nothing, if already disabled.
if (!is_enabled_)
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698