Corner Passthrough for Accessibility

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/accessibility_delegate.h"
 #include "ash/audio/sounds.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 19 matching lines @@
       Shell::GetInstance()->system_tray_notifier();
   if (system_tray_notifier)
     system_tray_notifier->RemoveAccessibilityObserver(this);
 }
 
 void AshTouchExplorationManager::OnAccessibilityModeChanged(
     AccessibilityNotificationVisibility notify) {
   UpdateTouchExplorationState();
 }
 
-void AshTouchExplorationManager::PlayVolumeAdjustSound() {
-  if (!VolumeAdjustSoundEnabled())
-    return;
-  if ((!audio_handler_->IsOutputMuted()) ||
-      !(audio_handler_->GetOutputVolumePercent() == 100))
-    PlaySystemSoundIfSpokenFeedback(chromeos::SOUND_VOLUME_ADJUST);
-}
-
 void AshTouchExplorationManager::SetOutputLevel(int volume) {
   if (volume > 0) {
     if (audio_handler_->IsOutputMuted()) {
       audio_handler_->SetOutputMute(false);
     }
   }
   audio_handler_->SetOutputVolumePercent(volume);
   // Avoid negative volume.
   if (audio_handler_->IsOutputVolumeBelowDefaultMuteLevel())
     audio_handler_->SetOutputMute(true);
 }
 
+void AshTouchExplorationManager::PlayVolumeAdjustEarcon() {
+  if (!VolumeAdjustSoundEnabled())
+    return;
+  if ((!audio_handler_->IsOutputMuted()) ||

[James Cook, 2014/07/28 19:10:42]

Too many parens here:

if (!audio_handler_->IsOutputMuted() || audio_handler_->GetOutputVolumePercent()
!= 100) ...

but is that what you really want?  It seems like this should be !muted &&
!full_volume

[lisayin, 2014/07/28 20:31:27]

Done.

+      !(audio_handler_->GetOutputVolumePercent() == 100))
+    PlaySystemSoundIfSpokenFeedback(chromeos::SOUND_VOLUME_ADJUST);
+}
+
+void AshTouchExplorationManager::PlayPassthroughEarcon() {
+  Shell::GetInstance()->accessibility_delegate()->PlayEarcon(
+      chromeos::SOUND_PASSTHROUGH);
+}
+void AshTouchExplorationManager::PlayExitScreenEarcon() {

[James Cook, 2014/07/28 19:10:42]

nit: blank line above

[lisayin, 2014/07/28 20:31:28]

Done.

+  Shell::GetInstance()->accessibility_delegate()->PlayEarcon(
+      chromeos::SOUND_EXIT_SCREEN);
+}
+
+void AshTouchExplorationManager::PlayEnterScreenEarcon() {
+  Shell::GetInstance()->accessibility_delegate()->PlayEarcon(
+      chromeos::SOUND_ENTER_SCREEN);
+}
+
 void AshTouchExplorationManager::UpdateTouchExplorationState() {
   AccessibilityDelegate* delegate =
       Shell::GetInstance()->accessibility_delegate();
   bool enabled = delegate->IsSpokenFeedbackEnabled();
 
   if (enabled && !touch_exploration_controller_.get()) {
     touch_exploration_controller_.reset(new ui::TouchExplorationController(
         root_window_controller_->GetRootWindow(), this));
   } else if (!enabled) {
     touch_exploration_controller_.reset();
   }
 }
 
 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kDisableVolumeAdjustSound);
 }
 
 }  // namespace ash