Skip to content

Commit

Permalink
Scope and clean up uses of AccessibilityMode.
Browse files Browse the repository at this point in the history 
This CL removes the typedef |AccessibilityMode| and instead uses a class
which allows us to stop using the all UPPER CASE prefix
ACCESSIBILITY_MODE_FLAG_.

R=dmazzoni

BUG=None
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation

Review-Url: https://codereview.chromium.org/2694413006
Cr-Commit-Position: refs/heads/master@{#456614}
  • Loading branch information
@dougt
dougt authored and Commit bot committed Mar 14, 2017
1 parent db0a348 commit cd3dad7
Show file tree
Hide file tree
Showing 41 changed files with 478 additions and 423 deletions.
27 changes: 13 additions & 14 deletions content/browser/accessibility/accessibility_action_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, FocusAction) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<button>One</button>"
Expand All @@ -91,9 +91,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, FocusAction) {
BrowserAccessibility* target = FindNode(ui::AX_ROLE_BUTTON, "One");
ASSERT_NE(nullptr, target);

AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_FOCUS);
AccessibilityNotificationWaiter waiter2(
shell()->web_contents(), kAccessibilityModeComplete, ui::AX_EVENT_FOCUS);
GetManager()->SetFocus(*target);
waiter2.WaitForNotification();

Expand All @@ -106,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<input type=range min=2 value=8 max=10 step=2>");
Expand All @@ -120,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
// Increment, should result in value changing from 8 to 10.
{
AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_VALUE_CHANGED);
GetManager()->Increment(*target);
waiter2.WaitForNotification();
Expand All @@ -130,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
// Increment, should result in value staying the same (max).
{
AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_VALUE_CHANGED);
GetManager()->Increment(*target);
waiter2.WaitForNotification();
Expand All @@ -140,7 +139,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
// Decrement, should result in value changing from 10 to 8.
{
AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_VALUE_CHANGED);
GetManager()->Decrement(*target);
waiter2.WaitForNotification();
Expand All @@ -152,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImage) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<body>"
Expand All @@ -179,7 +178,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImage) {
ASSERT_NE(nullptr, target);

AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_IMAGE_FRAME_UPDATED);
GetManager()->GetImageData(*target, gfx::Size());
waiter2.WaitForNotification();
Expand All @@ -202,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImageScale) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<body>"
Expand All @@ -223,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImageScale) {
ASSERT_NE(nullptr, target);

AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_IMAGE_FRAME_UPDATED);
GetManager()->GetImageData(*target, gfx::Size(4, 4));
waiter2.WaitForNotification();
Expand All @@ -246,7 +245,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, ImgElementGetImage) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<body>"
Expand All @@ -261,7 +260,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, ImgElementGetImage) {
ASSERT_NE(nullptr, target);

AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_IMAGE_FRAME_UPDATED);
GetManager()->GetImageData(*target, gfx::Size());
waiter2.WaitForNotification();
Expand Down
38 changes: 17 additions & 21 deletions content/browser/accessibility/accessibility_ipc_error_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,12 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
ASSERT_EQ(nullptr, frame->GetOrCreateBrowserAccessibilityManager());

{
// Enable accessibility (passing ACCESSIBILITY_MODE_COMPLETE to
// Enable accessibility (passing kAccessibilityModeComplete to
// AccessibilityNotificationWaiter does this automatically) and wait for
// the first event.
AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_LAYOUT_COMPLETE);
AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_LAYOUT_COMPLETE);
waiter.WaitForNotification();
}

Expand All @@ -85,10 +84,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
{
// Hide one of the elements on the page, and wait for an accessibility
// notification triggered by the hide.
AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_LIVE_REGION_CHANGED);
AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_LIVE_REGION_CHANGED);
ASSERT_TRUE(ExecuteScript(
shell(), "document.getElementById('p1').style.display = 'none';"));
waiter.WaitForNotification();
Expand All @@ -103,9 +101,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
frame->set_no_create_browser_accessibility_manager_for_testing(false);
const ui::AXTree* tree = nullptr;
{
AccessibilityNotificationWaiter waiter(
shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_FOCUS);
AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_FOCUS);
ASSERT_TRUE(
ExecuteScript(shell(), "document.getElementById('button').focus();"));
waiter.WaitForNotification();
Expand Down Expand Up @@ -151,13 +149,12 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
shell()->web_contents()->GetMainFrame());

{
// Enable accessibility (passing ACCESSIBILITY_MODE_COMPLETE to
// Enable accessibility (passing kAccessibilityModeComplete to
// AccessibilityNotificationWaiter does this automatically) and wait for
// the first event.
AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_LAYOUT_COMPLETE);
AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_LAYOUT_COMPLETE);
waiter.WaitForNotification();
}

Expand All @@ -184,10 +181,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
if (iteration == max_iterations - 1)
break;

AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_LOAD_COMPLETE);
AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
waiter.WaitForNotification();
}

Expand Down
47 changes: 23 additions & 24 deletions content/browser/accessibility/accessibility_mode_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/accessibility_mode.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/render_widget_host_view.h"
Expand Down Expand Up @@ -63,32 +64,31 @@ class AccessibilityModeTest : public ContentBrowserTest {

IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeOff) {
NavigateToURL(shell(), GURL(kMinimalPageDataURL));

EXPECT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode());
EXPECT_TRUE(web_contents()->GetAccessibilityMode().is_mode_off());
EXPECT_EQ(nullptr, GetManager());
}

IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeComplete) {
NavigateToURL(shell(), GURL(kMinimalPageDataURL));
ASSERT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode());
ASSERT_TRUE(web_contents()->GetAccessibilityMode().is_mode_off());

AccessibilityNotificationWaiter waiter(shell()->web_contents());
web_contents()->AddAccessibilityMode(ACCESSIBILITY_MODE_COMPLETE);
EXPECT_EQ(ACCESSIBILITY_MODE_COMPLETE,
web_contents()->GetAccessibilityMode());
web_contents()->AddAccessibilityMode(kAccessibilityModeComplete);
EXPECT_TRUE(web_contents()->GetAccessibilityMode() ==
kAccessibilityModeComplete);
waiter.WaitForNotification();
EXPECT_NE(nullptr, GetManager());
}

IN_PROC_BROWSER_TEST_F(AccessibilityModeTest,
AccessibilityModeWebContentsOnly) {
NavigateToURL(shell(), GURL(kMinimalPageDataURL));
ASSERT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode());
ASSERT_TRUE(web_contents()->GetAccessibilityMode().is_mode_off());

AccessibilityNotificationWaiter waiter(shell()->web_contents());
web_contents()->AddAccessibilityMode(ACCESSIBILITY_MODE_WEB_CONTENTS_ONLY);
EXPECT_EQ(ACCESSIBILITY_MODE_WEB_CONTENTS_ONLY,
web_contents()->GetAccessibilityMode());
web_contents()->AddAccessibilityMode(kAccessibilityModeWebContentsOnly);
EXPECT_TRUE(web_contents()->GetAccessibilityMode() ==
kAccessibilityModeWebContentsOnly);
waiter.WaitForNotification();
// No BrowserAccessibilityManager expected for this mode.
EXPECT_EQ(nullptr, GetManager());
Expand All @@ -98,16 +98,16 @@ IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AddingModes) {
NavigateToURL(shell(), GURL(kMinimalPageDataURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents());
web_contents()->AddAccessibilityMode(ACCESSIBILITY_MODE_WEB_CONTENTS_ONLY);
EXPECT_EQ(ACCESSIBILITY_MODE_WEB_CONTENTS_ONLY,
web_contents()->GetAccessibilityMode());
web_contents()->AddAccessibilityMode(kAccessibilityModeWebContentsOnly);
EXPECT_TRUE(web_contents()->GetAccessibilityMode() ==
kAccessibilityModeWebContentsOnly);
waiter.WaitForNotification();
EXPECT_EQ(nullptr, GetManager());

AccessibilityNotificationWaiter waiter2(shell()->web_contents());
web_contents()->AddAccessibilityMode(ACCESSIBILITY_MODE_COMPLETE);
EXPECT_EQ(ACCESSIBILITY_MODE_COMPLETE,
web_contents()->GetAccessibilityMode());
web_contents()->AddAccessibilityMode(kAccessibilityModeComplete);
EXPECT_TRUE(web_contents()->GetAccessibilityMode() ==
kAccessibilityModeComplete);
waiter2.WaitForNotification();
EXPECT_NE(nullptr, GetManager());
}
Expand All @@ -120,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityModeTest,
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
ACCESSIBILITY_MODE_COMPLETE,
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,<p>Para</p>");
NavigateToURL(shell(), url);
Expand All @@ -144,8 +144,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityModeTest,

AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
ACCESSIBILITY_MODE_FLAG_NATIVE_APIS |
ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS,
AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,<p>Para</p>");
NavigateToURL(shell(), url);
Expand All @@ -162,8 +161,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AddScreenReaderModeFlag) {

AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
ACCESSIBILITY_MODE_FLAG_NATIVE_APIS |
ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS,
AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,<input aria-label=Foo placeholder=Bar>");
NavigateToURL(shell(), url);
Expand All @@ -174,10 +172,11 @@ IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AddScreenReaderModeFlag) {
EXPECT_FALSE(textbox->HasStringAttribute(ui::AX_ATTR_PLACEHOLDER));
int original_id = textbox->GetId();

AccessibilityNotificationWaiter waiter2(
shell()->web_contents(), 0, ui::AX_EVENT_LAYOUT_COMPLETE);
AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
AccessibilityMode(),
ui::AX_EVENT_LAYOUT_COMPLETE);
BrowserAccessibilityStateImpl::GetInstance()->AddAccessibilityModeFlags(
ACCESSIBILITY_MODE_FLAG_SCREEN_READER);
AccessibilityMode::kScreenReader);
waiter2.WaitForNotification();

const BrowserAccessibility* textbox2 = FindNode(
Expand Down
Loading

0 comments on commit cd3dad7

Please sign in to comment.