ash/audio/sounds.cc - Issue 2101263004: mash: Migrate AccessibilityDelegate access to WmShell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: cleanup Created 4 years, 6 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

« ash/ash_touch_exploration_manager_chromeos.cc ('K') | « ash/ash_touch_exploration_manager_chromeos.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | ash/system/tray/system_tray.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/audio/sounds.cc

diff --git a/ash/audio/sounds.cc b/ash/audio/sounds.cc

index b9110ba28c0ab1653a05038d52816c66b3fca26f..8eb4b38f93230d2098cdfa132f48c70fe06f01ad 100644

--- a/ash/audio/sounds.cc

+++ b/ash/audio/sounds.cc

@@ -6,7 +6,7 @@

#include "ash/common/accessibility_delegate.h"

#include "ash/common/ash_switches.h"

-#include "ash/shell.h"

+#include "ash/common/wm_shell.h"

#include "base/command_line.h"

using media::SoundsManager;

@@ -28,8 +28,7 @@ bool PlaySystemSoundIfSpokenFeedback(SoundsManager::SoundKey key) {

if (cl->HasSwitch(switches::kAshEnableSystemSounds))

return SoundsManager::Get()->Play(key);

- Shell* shell = Shell::GetInstance();

- if (!shell->accessibility_delegate()->IsSpokenFeedbackEnabled())

+ if (!WmShell::Get()->GetAccessibilityDelegate()->IsSpokenFeedbackEnabled())

return false;

return SoundsManager::Get()->Play(key);