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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2558933002: Add more fine-grained accessibility modes. (Closed)
Patch Set: Reformat enums as uppercase Created 4 years 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 | « content/browser/accessibility/accessibility_ui.cc ('k') | content/browser/accessibility/android_granularity_movement_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..81f7cd04f344277c97eae7b91f6ed3b219f15dad 100644
--- a/content/browser/accessibility/accessibility_win_browsertest.cc
+++ b/content/browser/accessibility/accessibility_win_browsertest.cc
@@ -14,7 +14,6 @@
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
#include "base/win/scoped_variant.h"
-#include "content/browser/accessibility/accessibility_mode_helper.h"
#include "content/browser/accessibility/accessibility_tree_formatter.h"
#include "content/browser/accessibility/accessibility_tree_formatter_utils_win.h"
#include "content/browser/accessibility/browser_accessibility_manager_win.h"
@@ -105,7 +104,7 @@ AccessibilityWinBrowserTest::~AccessibilityWinBrowserTest() {
void AccessibilityWinBrowserTest::LoadInitialAccessibilityTreeFromHtml(
const std::string& html) {
AccessibilityNotificationWaiter waiter(
- shell()->web_contents(), AccessibilityModeComplete,
+ shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_LOAD_COMPLETE);
GURL html_data_url("data:text/html," + html);
NavigateToURL(shell(), html_data_url);
@@ -163,7 +162,7 @@ void AccessibilityWinBrowserTest::SetUpInputField(
// Set the caret on the last character.
AccessibilityNotificationWaiter waiter(
- shell()->web_contents(), AccessibilityModeComplete,
+ shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_TEXT_SELECTION_CHANGED);
std::wstring caret_offset = base::UTF16ToWide(base::IntToString16(
static_cast<int>(CONTENTS_LENGTH - 1)));
@@ -215,7 +214,7 @@ void AccessibilityWinBrowserTest::SetUpTextareaField(
// Set the caret on the last character.
AccessibilityNotificationWaiter waiter(
- shell()->web_contents(), AccessibilityModeComplete,
+ shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_TEXT_SELECTION_CHANGED);
std::wstring caret_offset = base::UTF16ToWide(base::IntToString16(
static_cast<int>(CONTENTS_LENGTH - 1)));
@@ -630,9 +629,6 @@ AccessibilityWinBrowserTest::AccessibleChecker::RoleVariantToString(
IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
TestBusyAccessibilityTree) {
- if (GetBaseAccessibilityMode() != AccessibilityModeOff)
- return;
-
NavigateToURL(shell(), GURL(url::kAboutBlankURL));
// The initial accessible returned should have state STATE_SYSTEM_BUSY while
@@ -674,7 +670,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
// Set focus to the radio group.
std::unique_ptr<AccessibilityNotificationWaiter> waiter(
new AccessibilityNotificationWaiter(shell()->web_contents(),
- AccessibilityModeComplete,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_FOCUS));
ExecuteScript(L"document.body.children[0].focus()");
waiter->WaitForNotification();
@@ -686,7 +682,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(), ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_FOCUS));
ExecuteScript(
L"document.body.children[0].setAttribute('aria-activedescendant', 'li')");
@@ -719,7 +715,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
// Check the checkbox.
std::unique_ptr<AccessibilityNotificationWaiter> waiter(
new AccessibilityNotificationWaiter(shell()->web_contents(),
- AccessibilityModeComplete,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_CHECKED_STATE_CHANGED));
ExecuteScript(L"document.body.children[0].checked=true");
waiter->WaitForNotification();
@@ -746,7 +742,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,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_CHILDREN_CHANGED));
ExecuteScript(L"document.body.innerHTML='<b>new text</b>'");
waiter->WaitForNotification();
@@ -772,7 +768,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,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_CHILDREN_CHANGED));
ExecuteScript(L"document.body.children[0].style.visibility='visible'");
waiter->WaitForNotification();
@@ -805,7 +801,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
// Focus the div in the document
std::unique_ptr<AccessibilityNotificationWaiter> waiter(
new AccessibilityNotificationWaiter(shell()->web_contents(),
- AccessibilityModeComplete,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_FOCUS));
ExecuteScript(L"document.body.children[0].focus()");
waiter->WaitForNotification();
@@ -819,7 +815,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(), ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_BLUR));
base::win::ScopedComPtr<IAccessible> document_accessible(
GetRendererAccessible());
@@ -855,7 +851,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,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_VALUE_CHANGED));
ExecuteScript(L"document.body.children[0].value='new value'");
waiter->WaitForNotification();
@@ -1097,7 +1093,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, TestSetCaretOffset) {
AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
- AccessibilityModeComplete,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_TEXT_SELECTION_CHANGED);
caret_offset = 0;
hr = input_text->setCaretOffset(caret_offset);
@@ -1121,7 +1117,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
AccessibilityNotificationWaiter waiter(
shell()->web_contents(),
- AccessibilityModeComplete,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_TEXT_SELECTION_CHANGED);
caret_offset = 0;
hr = textarea_text->setCaretOffset(caret_offset);
@@ -1716,7 +1712,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,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_TEXT_CHANGED);
waiter.WaitForNotification();
EXPECT_HRESULT_SUCCEEDED(
@@ -1745,7 +1741,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,
+ ACCESSIBILITY_MODE_COMPLETE,
ui::AX_EVENT_LOAD_COMPLETE);
NavigateToURL(shell(), embedded_test_server()->GetURL(
"/accessibility/html/article.html"));
« no previous file with comments | « content/browser/accessibility/accessibility_ui.cc ('k') | content/browser/accessibility/android_granularity_movement_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698