Skip to content

Commit

Permalink
Move the accessibility mode flags from content/ to ui/
Browse files Browse the repository at this point in the history 
In order to use the accessibility mode flags from the ui AXPlatformNode
and friends, we need to move the flags from content/common into
ui/accessibility. The majority of this change is mechincal renaming.

Bug: 703369
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: I683d1e0abcf5ce33b65ea206f07899a12a284bb5
Reviewed-on: https://chromium-review.googlesource.com/588383
Commit-Queue: Doug Turner <dougt@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490630}
  • Loading branch information
@dougt
dougt authored and Commit Bot committed Jul 29, 2017
1 parent 5c48668 commit 63f3c7b
Show file tree
Hide file tree
Showing 49 changed files with 386 additions and 429 deletions.
39 changes: 17 additions & 22 deletions content/browser/accessibility/accessibility_action_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,8 @@ class AccessibilityActionBrowserTest : public ContentBrowserTest {
IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, FocusAction) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
AccessibilityNotificationWaiter waiter(
shell()->web_contents(), ui::kAXModeComplete, ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<button>One</button>"
"<button>Two</button>"
Expand All @@ -92,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, FocusAction) {
ASSERT_NE(nullptr, target);

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

Expand All @@ -104,9 +103,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
IncrementDecrementActions) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

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

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
AccessibilityNotificationWaiter waiter(
shell()->web_contents(), ui::kAXModeComplete, ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<body>"
"<canvas aria-label='canvas' id='c' width='4' height='2'></canvas>"
Expand All @@ -178,7 +175,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImage) {
ASSERT_NE(nullptr, target);

AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
kAccessibilityModeComplete,
ui::kAXModeComplete,
ui::AX_EVENT_IMAGE_FRAME_UPDATED);
GetManager()->GetImageData(*target, gfx::Size());
waiter2.WaitForNotification();
Expand All @@ -200,9 +197,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImage) {
IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImageScale) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
AccessibilityNotificationWaiter waiter(
shell()->web_contents(), ui::kAXModeComplete, ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<body>"
"<canvas aria-label='canvas' id='c' width='40' height='20'></canvas>"
Expand All @@ -222,7 +218,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImageScale) {
ASSERT_NE(nullptr, target);

AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
kAccessibilityModeComplete,
ui::kAXModeComplete,
ui::AX_EVENT_IMAGE_FRAME_UPDATED);
GetManager()->GetImageData(*target, gfx::Size(4, 4));
waiter2.WaitForNotification();
Expand All @@ -244,9 +240,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImageScale) {
IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, ImgElementGetImage) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
AccessibilityNotificationWaiter waiter(
shell()->web_contents(), ui::kAXModeComplete, ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,"
"<body>"
"<img src='data:image/gif;base64,R0lGODdhAgADAKEDAAAA//"
Expand All @@ -260,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, ImgElementGetImage) {
ASSERT_NE(nullptr, target);

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

{
// Enable accessibility (passing kAccessibilityModeComplete to
// Enable accessibility (passing ui::kAXModeComplete to
// AccessibilityNotificationWaiter does this automatically) and wait for
// the first event.
AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::kAXModeComplete,
ui::AX_EVENT_LAYOUT_COMPLETE);
waiter.WaitForNotification();
}
Expand All @@ -85,7 +85,7 @@ 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(),
kAccessibilityModeComplete,
ui::kAXModeComplete,
ui::AX_EVENT_LIVE_REGION_CHANGED);
ASSERT_TRUE(ExecuteScript(
shell(), "document.getElementById('p1').style.display = 'none';"));
Expand All @@ -101,9 +101,8 @@ 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(),
kAccessibilityModeComplete,
ui::AX_EVENT_FOCUS);
AccessibilityNotificationWaiter waiter(
shell()->web_contents(), ui::kAXModeComplete, ui::AX_EVENT_FOCUS);
ASSERT_TRUE(
ExecuteScript(shell(), "document.getElementById('button').focus();"));
waiter.WaitForNotification();
Expand Down Expand Up @@ -149,11 +148,11 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
shell()->web_contents()->GetMainFrame());

{
// Enable accessibility (passing kAccessibilityModeComplete to
// Enable accessibility (passing ui::kAXModeComplete to
// AccessibilityNotificationWaiter does this automatically) and wait for
// the first event.
AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::kAXModeComplete,
ui::AX_EVENT_LAYOUT_COMPLETE);
waiter.WaitForNotification();
}
Expand Down Expand Up @@ -182,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
break;

AccessibilityNotificationWaiter waiter(shell()->web_contents(),
kAccessibilityModeComplete,
ui::kAXModeComplete,
ui::AX_EVENT_LOAD_COMPLETE);
waiter.WaitForNotification();
}
Expand Down
35 changes: 16 additions & 19 deletions content/browser/accessibility/accessibility_mode_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#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 All @@ -18,6 +17,7 @@
#include "content/shell/browser/shell.h"
#include "content/test/accessibility_browser_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/accessibility/ax_modes.h"

namespace content {

Expand Down Expand Up @@ -73,9 +73,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeComplete) {
ASSERT_TRUE(web_contents()->GetAccessibilityMode().is_mode_off());

AccessibilityNotificationWaiter waiter(shell()->web_contents());
web_contents()->AddAccessibilityMode(kAccessibilityModeComplete);
EXPECT_TRUE(web_contents()->GetAccessibilityMode() ==
kAccessibilityModeComplete);
web_contents()->AddAccessibilityMode(ui::kAXModeComplete);
EXPECT_TRUE(web_contents()->GetAccessibilityMode() == ui::kAXModeComplete);
waiter.WaitForNotification();
EXPECT_NE(nullptr, GetManager());
}
Expand All @@ -86,9 +85,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityModeTest,
ASSERT_TRUE(web_contents()->GetAccessibilityMode().is_mode_off());

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

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

AccessibilityNotificationWaiter waiter2(shell()->web_contents());
web_contents()->AddAccessibilityMode(kAccessibilityModeComplete);
EXPECT_TRUE(web_contents()->GetAccessibilityMode() ==
kAccessibilityModeComplete);
web_contents()->AddAccessibilityMode(ui::kAXModeComplete);
EXPECT_TRUE(web_contents()->GetAccessibilityMode() == ui::kAXModeComplete);
waiter2.WaitForNotification();
EXPECT_NE(nullptr, GetManager());
}
Expand All @@ -119,9 +117,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityModeTest,
#if !defined(OS_ANDROID)
NavigateToURL(shell(), GURL(url::kAboutBlankURL));

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

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

AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents,
ui::AXMode::kNativeAPIs | ui::AXMode::kWebContents,
ui::AX_EVENT_LOAD_COMPLETE);
GURL url("data:text/html,<input aria-label=Foo placeholder=Bar>");
NavigateToURL(shell(), url);
Expand All @@ -172,10 +169,10 @@ 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(), AccessibilityMode(), ui::AX_EVENT_LOAD_COMPLETE);
AccessibilityNotificationWaiter waiter2(shell()->web_contents(), ui::AXMode(),
ui::AX_EVENT_LOAD_COMPLETE);
BrowserAccessibilityStateImpl::GetInstance()->AddAccessibilityModeFlags(
AccessibilityMode::kScreenReader);
ui::AXMode::kScreenReader);
waiter2.WaitForNotification();

const BrowserAccessibility* textbox2 = FindNode(
Expand Down
Loading

0 comments on commit 63f3c7b

Please sign in to comment.