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

Side by Side Diff: ash/audio/sounds.cc

Issue 2101263004: mash: Migrate AccessibilityDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/audio/sounds.h" 5 #include "ash/audio/sounds.h"
6 6
7 #include "ash/common/accessibility_delegate.h" 7 #include "ash/common/accessibility_delegate.h"
8 #include "ash/common/ash_switches.h" 8 #include "ash/common/ash_switches.h"
9 #include "ash/shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 11
12 using media::SoundsManager; 12 using media::SoundsManager;
13 13
14 namespace ash { 14 namespace ash {
15 15
16 bool PlaySystemSoundAlways(SoundsManager::SoundKey key) { 16 bool PlaySystemSoundAlways(SoundsManager::SoundKey key) {
17 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 17 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
18 switches::kAshDisableSystemSounds)) 18 switches::kAshDisableSystemSounds))
19 return false; 19 return false;
20 return SoundsManager::Get()->Play(key); 20 return SoundsManager::Get()->Play(key);
21 } 21 }
22 22
23 bool PlaySystemSoundIfSpokenFeedback(SoundsManager::SoundKey key) { 23 bool PlaySystemSoundIfSpokenFeedback(SoundsManager::SoundKey key) {
24 base::CommandLine* cl = base::CommandLine::ForCurrentProcess(); 24 base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
25 if (cl->HasSwitch(switches::kAshDisableSystemSounds)) 25 if (cl->HasSwitch(switches::kAshDisableSystemSounds))
26 return false; 26 return false;
27 27
28 if (cl->HasSwitch(switches::kAshEnableSystemSounds)) 28 if (cl->HasSwitch(switches::kAshEnableSystemSounds))
29 return SoundsManager::Get()->Play(key); 29 return SoundsManager::Get()->Play(key);
30 30
31 Shell* shell = Shell::GetInstance(); 31 if (!WmShell::Get()->GetAccessibilityDelegate()->IsSpokenFeedbackEnabled())
32 if (!shell->accessibility_delegate()->IsSpokenFeedbackEnabled())
33 return false; 32 return false;
34 33
35 return SoundsManager::Get()->Play(key); 34 return SoundsManager::Get()->Play(key);
36 } 35 }
37 36
38 } // namespace ash 37 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_touch_exploration_manager_chromeos.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698