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

Unified Diff: ash/ash_touch_exploration_manager_chromeos.cc

Issue 410783002: Corner Passthrough for Accessibility (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@side-gestures
Patch Set: Fixed some rebase quirks Created 6 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
Index: ash/ash_touch_exploration_manager_chromeos.cc
diff --git a/ash/ash_touch_exploration_manager_chromeos.cc b/ash/ash_touch_exploration_manager_chromeos.cc
index f5e212b9525c6ec55b9f291c1ad3a52a6d438d42..c7292b78a63e299f18a6004b5dff627f897e816b 100644
--- a/ash/ash_touch_exploration_manager_chromeos.cc
+++ b/ash/ash_touch_exploration_manager_chromeos.cc
@@ -37,14 +37,6 @@ void AshTouchExplorationManager::OnAccessibilityModeChanged(
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()) {
@@ -57,6 +49,28 @@ void AshTouchExplorationManager::SetOutputLevel(int volume) {
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_->IsOutp
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();

Powered by Google App Engine
This is Rietveld 408576698