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

Unified Diff: ash/accelerators/spoken_feedback_toggler_unittest.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, 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/spoken_feedback_toggler.cc ('k') | ash/ash_touch_exploration_manager_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/spoken_feedback_toggler_unittest.cc
diff --git a/ash/accelerators/spoken_feedback_toggler_unittest.cc b/ash/accelerators/spoken_feedback_toggler_unittest.cc
index 4f70e50ff7fee6366b6c7c7abe235626d60b992d..ead3bc70296cae81b4f15677c08aed87dacd5a5c 100644
--- a/ash/accelerators/spoken_feedback_toggler_unittest.cc
+++ b/ash/accelerators/spoken_feedback_toggler_unittest.cc
@@ -4,20 +4,20 @@
#include "ash/accelerators/spoken_feedback_toggler.h"
#include "ash/common/accessibility_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_util.h"
#include "ui/aura/test/test_window_delegate.h"
+#include "ui/aura/window.h"
#include "ui/events/test/event_generator.h"
namespace ash {
-typedef ash::test::AshTestBase SpokenFeedbackTogglerTest;
+using SpokenFeedbackTogglerTest = test::AshTestBase;
TEST_F(SpokenFeedbackTogglerTest, Basic) {
SpokenFeedbackToggler::ScopedEnablerForTest scoped;
- Shell* shell = Shell::GetInstance();
- AccessibilityDelegate* delegate = shell->accessibility_delegate();
+ AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
ui::test::EventGenerator& generator = GetEventGenerator();
EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());
« no previous file with comments | « ash/accelerators/spoken_feedback_toggler.cc ('k') | ash/ash_touch_exploration_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698