ash/accelerators/spoken_feedback_toggler.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/accelerators/spoken_feedback_toggler.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

« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/accelerators/spoken_feedback_toggler_unittest.cc » ('j') | ash/accelerators/spoken_feedback_toggler_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/accelerators/spoken_feedback_toggler.cc

diff --git a/ash/accelerators/spoken_feedback_toggler.cc b/ash/accelerators/spoken_feedback_toggler.cc

index 942208a4117d5fa112195ab5bc095ef5528e79e5..7b7d0d5279f57c697fd55ab92b82a487ef81ed59 100644

--- a/ash/accelerators/spoken_feedback_toggler.cc

+++ b/ash/accelerators/spoken_feedback_toggler.cc

@@ -9,7 +9,7 @@

#include "ash/accelerators/key_hold_detector.h"

#include "ash/common/accessibility_delegate.h"

#include "ash/common/accessibility_types.h"

-#include "ash/shell.h"

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

#include "ui/events/event.h"

namespace ash {

@@ -53,7 +53,7 @@ bool SpokenFeedbackToggler::ShouldStopEventPropagation() const {

void SpokenFeedbackToggler::OnKeyHold(const ui::KeyEvent* event) {

if (!toggled_) {

toggled_ = true;

- Shell::GetInstance()->accessibility_delegate()->ToggleSpokenFeedback(

+ WmShell::Get()->GetAccessibilityDelegate()->ToggleSpokenFeedback(

A11Y_NOTIFICATION_SHOW);

}