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

Unified Diff: chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.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/wm/overview/window_selector_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
index 73757283efbe61c9d6760d722afb7e4dd061ae47..aa6fffbad33ca7fc8f57b8f2fe2bee3b4047cb56 100644
--- a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
@@ -6,6 +6,7 @@
#include "ash/common/accessibility_delegate.h"
#include "ash/common/accessibility_types.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/macros.h"
@@ -25,8 +26,6 @@
#include "ui/events/test/event_generator.h"
#include "ui/events/test/test_event_handler.h"
-namespace ui {
-
class TouchExplorationTest : public InProcessBrowserTest {
public:
TouchExplorationTest() : simulated_clock_(new base::SimpleTestTickClock()) {
@@ -58,10 +57,10 @@ class TouchExplorationTest : public InProcessBrowserTest {
}
void SwitchTouchExplorationMode(bool on) {
- ash::AccessibilityDelegate* ad =
- ash::Shell::GetInstance()->accessibility_delegate();
- if (on != ad->IsSpokenFeedbackEnabled())
- ad->ToggleSpokenFeedback(ash::A11Y_NOTIFICATION_NONE);
+ ash::AccessibilityDelegate* delegate =
+ ash::WmShell::Get()->GetAccessibilityDelegate();
+ if (on != delegate->IsSpokenFeedbackEnabled())
+ delegate->ToggleSpokenFeedback(ash::A11Y_NOTIFICATION_NONE);
}
base::TimeTicks Now() { return simulated_clock_->NowTicks(); }
@@ -248,5 +247,3 @@ IN_PROC_BROWSER_TEST_F(TouchExplorationTest, DISABLED_SplitTapExplore) {
EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
EXPECT_FALSE(cursor_client->IsCursorVisible());
}
-
-} // namespace ui
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698