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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 2078393005: mash: Move accessibility_types.h from ui namespace to ash namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a11y
Patch Set: fix chromevox code generated from js 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 | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index bc7b1070cf85c4e02b4c08b361d3f2da7c484274..8b900a16e557d36117d73a1281bc22da260e2eb1 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/accessibility_types.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
@@ -292,10 +293,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {
// Toggling spoken feedback changes the visibillity of the icon.
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(IsTrayIconVisible());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_FALSE(IsTrayIconVisible());
// Toggling high contrast the visibillity of the icon.
@@ -323,12 +324,12 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {
AccessibilityManager::Get()->EnableHighContrast(true);
EXPECT_TRUE(IsTrayIconVisible());
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(IsTrayIconVisible());
AccessibilityManager::Get()->EnableVirtualKeyboard(true);
EXPECT_TRUE(IsTrayIconVisible());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(IsTrayIconVisible());
AccessibilityManager::Get()->EnableHighContrast(false);
EXPECT_TRUE(IsTrayIconVisible());
@@ -360,10 +361,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {
// Toggling spoken feedback changes the visibillity of the menu.
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_FALSE(CanCreateMenuItem());
// Toggling high contrast changes the visibillity of the menu.
@@ -396,7 +397,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {
AccessibilityManager::Get()->EnableHighContrast(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableAutoclick(true);
EXPECT_TRUE(CanCreateMenuItem());
@@ -407,7 +408,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {
AccessibilityManager::Get()->EnableAutoclick(false);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableHighContrast(false);
EXPECT_TRUE(CanCreateMenuItem());
@@ -429,10 +430,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {
// The menu remains visible regardless of toggling spoken feedback.
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
// The menu remains visible regardless of toggling high contrast.
@@ -465,7 +466,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {
AccessibilityManager::Get()->EnableHighContrast(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableAutoclick(true);
EXPECT_TRUE(CanCreateMenuItem());
@@ -476,7 +477,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {
AccessibilityManager::Get()->EnableAutoclick(false);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableHighContrast(false);
EXPECT_TRUE(CanCreateMenuItem());
@@ -497,10 +498,10 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) {
// The menu remains visible regardless of toggling spoken feedback.
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
// The menu remains visible regardless of toggling high contrast.
@@ -527,14 +528,14 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) {
AccessibilityManager::Get()->EnableHighContrast(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableVirtualKeyboard(true);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableVirtualKeyboard(false);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CanCreateMenuItem());
AccessibilityManager::Get()->EnableHighContrast(false);
EXPECT_TRUE(CanCreateMenuItem());
@@ -564,7 +565,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowNotification) {
// Enabling spoken feedback should show the notification.
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_SHOW);
+ true, ash::A11Y_NOTIFICATION_SHOW);
EXPECT_EQ(CHROMEVOX_ENABLED, GetNotificationText());
// Connecting a braille display when spoken feedback is already enabled
@@ -578,7 +579,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowNotification) {
EXPECT_TRUE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
EXPECT_FALSE(IsNotificationShown());
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_SHOW);
+ false, ash::A11Y_NOTIFICATION_SHOW);
EXPECT_FALSE(IsNotificationShown());
EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
@@ -680,7 +681,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
// Enabling spoken feedback.
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CreateDetailedMenu());
EXPECT_TRUE(IsSpokenFeedbackEnabledOnDetailMenu());
EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
@@ -692,7 +693,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
// Disabling spoken feedback.
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
EXPECT_TRUE(CreateDetailedMenu());
EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
@@ -792,7 +793,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
// Enabling all of the a11y features.
AccessibilityManager::Get()->EnableSpokenFeedback(
- true, ui::A11Y_NOTIFICATION_NONE);
+ true, ash::A11Y_NOTIFICATION_NONE);
AccessibilityManager::Get()->EnableHighContrast(true);
SetMagnifierEnabled(true);
AccessibilityManager::Get()->EnableLargeCursor(true);
@@ -808,7 +809,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
// Disabling all of the a11y features.
AccessibilityManager::Get()->EnableSpokenFeedback(
- false, ui::A11Y_NOTIFICATION_NONE);
+ false, ash::A11Y_NOTIFICATION_NONE);
AccessibilityManager::Get()->EnableHighContrast(false);
SetMagnifierEnabled(false);
AccessibilityManager::Get()->EnableLargeCursor(false);
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698