| Index: content/browser/accessibility/accessibility_win_browsertest.cc
|
| diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc
|
| index 546286e42ee071a62a2ee8cd4ff250f02452150d..0339e33017b1571f15cd30f34117c779a0f1ee2e 100644
|
| --- a/content/browser/accessibility/accessibility_win_browsertest.cc
|
| +++ b/content/browser/accessibility/accessibility_win_browsertest.cc
|
| @@ -105,7 +105,7 @@ AccessibilityWinBrowserTest::~AccessibilityWinBrowserTest() {
|
| void AccessibilityWinBrowserTest::LoadInitialAccessibilityTreeFromHtml(
|
| const std::string& html) {
|
| AccessibilityNotificationWaiter waiter(
|
| - shell()->web_contents(), AccessibilityModeComplete,
|
| + shell()->web_contents(), kAccessibilityModeComplete,
|
| ui::AX_EVENT_LOAD_COMPLETE);
|
| GURL html_data_url("data:text/html," + html);
|
| NavigateToURL(shell(), html_data_url);
|
| @@ -163,7 +163,7 @@ void AccessibilityWinBrowserTest::SetUpInputField(
|
|
|
| // Set the caret on the last character.
|
| AccessibilityNotificationWaiter waiter(
|
| - shell()->web_contents(), AccessibilityModeComplete,
|
| + shell()->web_contents(), kAccessibilityModeComplete,
|
| ui::AX_EVENT_TEXT_SELECTION_CHANGED);
|
| std::wstring caret_offset = base::UTF16ToWide(base::IntToString16(
|
| static_cast<int>(CONTENTS_LENGTH - 1)));
|
| @@ -215,7 +215,7 @@ void AccessibilityWinBrowserTest::SetUpTextareaField(
|
|
|
| // Set the caret on the last character.
|
| AccessibilityNotificationWaiter waiter(
|
| - shell()->web_contents(), AccessibilityModeComplete,
|
| + shell()->web_contents(), kAccessibilityModeComplete,
|
| ui::AX_EVENT_TEXT_SELECTION_CHANGED);
|
| std::wstring caret_offset = base::UTF16ToWide(base::IntToString16(
|
| static_cast<int>(CONTENTS_LENGTH - 1)));
|
| @@ -674,7 +674,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| // Set focus to the radio group.
|
| std::unique_ptr<AccessibilityNotificationWaiter> waiter(
|
| new AccessibilityNotificationWaiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_FOCUS));
|
| ExecuteScript(L"document.body.children[0].focus()");
|
| waiter->WaitForNotification();
|
| @@ -686,7 +686,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
|
|
| // Set the active descendant of the radio group
|
| waiter.reset(new AccessibilityNotificationWaiter(
|
| - shell()->web_contents(), AccessibilityModeComplete,
|
| + shell()->web_contents(), kAccessibilityModeComplete,
|
| ui::AX_EVENT_FOCUS));
|
| ExecuteScript(
|
| L"document.body.children[0].setAttribute('aria-activedescendant', 'li')");
|
| @@ -719,7 +719,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| // Check the checkbox.
|
| std::unique_ptr<AccessibilityNotificationWaiter> waiter(
|
| new AccessibilityNotificationWaiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_CHECKED_STATE_CHANGED));
|
| ExecuteScript(L"document.body.children[0].checked=true");
|
| waiter->WaitForNotification();
|
| @@ -746,7 +746,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| // Change the children of the document body.
|
| std::unique_ptr<AccessibilityNotificationWaiter> waiter(
|
| new AccessibilityNotificationWaiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_CHILDREN_CHANGED));
|
| ExecuteScript(L"document.body.innerHTML='<b>new text</b>'");
|
| waiter->WaitForNotification();
|
| @@ -772,7 +772,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| // Change the children of the document body.
|
| std::unique_ptr<AccessibilityNotificationWaiter> waiter(
|
| new AccessibilityNotificationWaiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_CHILDREN_CHANGED));
|
| ExecuteScript(L"document.body.children[0].style.visibility='visible'");
|
| waiter->WaitForNotification();
|
| @@ -805,7 +805,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| // Focus the div in the document
|
| std::unique_ptr<AccessibilityNotificationWaiter> waiter(
|
| new AccessibilityNotificationWaiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_FOCUS));
|
| ExecuteScript(L"document.body.children[0].focus()");
|
| waiter->WaitForNotification();
|
| @@ -819,7 +819,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| // Focus the document accessible. This will un-focus the current node.
|
| waiter.reset(
|
| new AccessibilityNotificationWaiter(
|
| - shell()->web_contents(), AccessibilityModeComplete,
|
| + shell()->web_contents(), kAccessibilityModeComplete,
|
| ui::AX_EVENT_BLUR));
|
| base::win::ScopedComPtr<IAccessible> document_accessible(
|
| GetRendererAccessible());
|
| @@ -855,7 +855,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| // Set the value of the text control
|
| std::unique_ptr<AccessibilityNotificationWaiter> waiter(
|
| new AccessibilityNotificationWaiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_VALUE_CHANGED));
|
| ExecuteScript(L"document.body.children[0].value='new value'");
|
| waiter->WaitForNotification();
|
| @@ -1097,7 +1097,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, TestSetCaretOffset) {
|
|
|
| AccessibilityNotificationWaiter waiter(
|
| shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_TEXT_SELECTION_CHANGED);
|
| caret_offset = 0;
|
| hr = input_text->setCaretOffset(caret_offset);
|
| @@ -1121,7 +1121,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
|
|
| AccessibilityNotificationWaiter waiter(
|
| shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_TEXT_SELECTION_CHANGED);
|
| caret_offset = 0;
|
| hr = textarea_text->setCaretOffset(caret_offset);
|
| @@ -1716,7 +1716,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, TestIAccessibleAction) {
|
| // Cllicking the image will change its name.
|
| EXPECT_HRESULT_SUCCEEDED(image_action->doAction(0));
|
| AccessibilityNotificationWaiter waiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_TEXT_CHANGED);
|
| waiter.WaitForNotification();
|
| EXPECT_HRESULT_SUCCEEDED(
|
| @@ -1745,7 +1745,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, HasHWNDAfterNavigation) {
|
| // Navigate to a new page and wait for the accessibility tree to load.
|
| AccessibilityNotificationWaiter waiter(
|
| shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + kAccessibilityModeComplete,
|
| ui::AX_EVENT_LOAD_COMPLETE);
|
| NavigateToURL(shell(), embedded_test_server()->GetURL(
|
| "/accessibility/html/article.html"));
|
|
|