mash: Migrate AccessibilityDelegate access to WmShell.

ash/ash_touch_exploration_manager_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/ash_touch_exploration_manager_chromeos.h"
 
 #include "ash/audio/sounds.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
@@ skipping 37 matching lines @@
       audio_handler_->SetOutputMute(false);
     }
   }
   audio_handler_->SetOutputVolumePercent(volume);
   // Avoid negative volume.
   if (audio_handler_->IsOutputVolumeBelowDefaultMuteLevel())
     audio_handler_->SetOutputMute(true);
 }
 
 void AshTouchExplorationManager::SilenceSpokenFeedback() {
-  AccessibilityDelegate* delegate =
-      Shell::GetInstance()->accessibility_delegate();
-  if (!delegate->IsSpokenFeedbackEnabled())
-    return;
-  delegate->SilenceSpokenFeedback();
+  if (WmShell::Get()->GetAccessibilityDelegate()->IsSpokenFeedbackEnabled())
+    WmShell::Get()->GetAccessibilityDelegate()->SilenceSpokenFeedback();
 }
 
 void AshTouchExplorationManager::PlayVolumeAdjustEarcon() {
   if (!VolumeAdjustSoundEnabled())
     return;
   if (!audio_handler_->IsOutputMuted() &&
       audio_handler_->GetOutputVolumePercent() != 100)
     PlaySystemSoundIfSpokenFeedback(chromeos::SOUND_VOLUME_ADJUST);
 }
 
 void AshTouchExplorationManager::PlayPassthroughEarcon() {
-  Shell::GetInstance()->accessibility_delegate()->PlayEarcon(
+  WmShell::Get()->GetAccessibilityDelegate()->PlayEarcon(
       chromeos::SOUND_PASSTHROUGH);
 }
 
 void AshTouchExplorationManager::PlayExitScreenEarcon() {
-  Shell::GetInstance()->accessibility_delegate()->PlayEarcon(
+  WmShell::Get()->GetAccessibilityDelegate()->PlayEarcon(
       chromeos::SOUND_EXIT_SCREEN);
 }
 
 void AshTouchExplorationManager::PlayEnterScreenEarcon() {
-  Shell::GetInstance()->accessibility_delegate()->PlayEarcon(
+  WmShell::Get()->GetAccessibilityDelegate()->PlayEarcon(
       chromeos::SOUND_ENTER_SCREEN);
 }
 
 void AshTouchExplorationManager::HandleAccessibilityGesture(
     ui::AXGesture gesture) {
-  Shell::GetInstance()->accessibility_delegate()->HandleAccessibilityGesture(
+  WmShell::Get()->GetAccessibilityDelegate()->HandleAccessibilityGesture(
       gesture);
 }
 
 void AshTouchExplorationManager::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   UpdateTouchExplorationState();
 }
 
 void AshTouchExplorationManager::SetTouchAccessibilityAnchorPoint(
     const gfx::Point& anchor_point) {
   if (touch_exploration_controller_) {
     touch_exploration_controller_->SetTouchAccessibilityAnchorPoint(
         anchor_point);
   }
 }
 
 void AshTouchExplorationManager::UpdateTouchExplorationState() {
   // Comes from components/exo/shell_surface.cc.
   const char kExoShellSurfaceWindowName[] = "ExoShellSurface";
 
   // See crbug.com/603745 for more details.
-  bool pass_through_surface =
+  const bool pass_through_surface =
       wm::GetActiveWindow() &&
       wm::GetActiveWindow()->name() == kExoShellSurfaceWindowName;
 
-  AccessibilityDelegate* delegate =
-      Shell::GetInstance()->accessibility_delegate();
-  bool enabled = delegate->IsSpokenFeedbackEnabled();
+  const bool spoken_feedback_enabled =
+      WmShell::Get()->GetAccessibilityDelegate()->IsSpokenFeedbackEnabled();
 
-  if (!pass_through_surface && enabled &&
+  if (!pass_through_surface && spoken_feedback_enabled &&

[James Cook, 2016/06/28 22:34:25]

Thanks for the rename - it's clearer.

[msw, 2016/06/28 22:49:50]

Acknowledged.

       !touch_exploration_controller_.get()) {
     touch_exploration_controller_.reset(new ui::TouchExplorationController(
         root_window_controller_->GetRootWindow(), this));
-  } else if (!enabled || pass_through_surface) {
+  } else if (!spoken_feedback_enabled || pass_through_surface) {
     touch_exploration_controller_.reset();
   }
 }
 
 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() {
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kDisableVolumeAdjustSound);
 }
 
 }  // namespace ash