content/browser/accessibility/accessibility_action_browsertest.cc - Issue 2694413006: Scope and clean up uses of AccessibilityMode.

Unified Diff: content/browser/accessibility/accessibility_action_browsertest.cc

Issue 2694413006: Scope and clean up uses of AccessibilityMode. (Closed)

Patch Set: merge Created 3 years, 9 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

Index: content/browser/accessibility/accessibility_action_browsertest.cc

diff --git a/content/browser/accessibility/accessibility_action_browsertest.cc b/content/browser/accessibility/accessibility_action_browsertest.cc

index 70a7f4fdbb8de260bcba37d565d041693b45400f..fc7022157d17ce8cab61346e4204487365e1cb28 100644

--- a/content/browser/accessibility/accessibility_action_browsertest.cc

+++ b/content/browser/accessibility/accessibility_action_browsertest.cc

@@ -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>"

@@ -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();

@@ -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>");

@@ -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();

@@ -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();

@@ -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();

@@ -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>"

@@ -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();

@@ -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>"

@@ -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();

@@ -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>"

@@ -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();

« no previous file with comments | « no previous file | content/browser/accessibility/accessibility_ipc_error_browsertest.cc » ('j') | no next file with comments »