diff options
| author | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 23:02:30 +0000 |
|---|---|---|
| committer | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 23:02:30 +0000 |
| commit | f5b6e247f1d29be30f53a293610e689e233dc5ff (patch) | |
| tree | 86c6c1996b65faf226e805c8a0631ec1500d0e9d /chrome/browser/accessibility_win_browsertest.cc | |
| parent | 5b59c6bb5ca490f5425d679f81983e28a8bc5a1e (diff) | |
| download | chromium_src-f5b6e247f1d29be30f53a293610e689e233dc5ff.zip chromium_src-f5b6e247f1d29be30f53a293610e689e233dc5ff.tar.gz chromium_src-f5b6e247f1d29be30f53a293610e689e233dc5ff.tar.bz2 | |
Enable renderer accessibility by default.
BUG=25564
TEST=none
Review URL: http://codereview.chromium.org/2358003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/accessibility_win_browsertest.cc')
| -rw-r--r-- | chrome/browser/accessibility_win_browsertest.cc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/chrome/browser/accessibility_win_browsertest.cc b/chrome/browser/accessibility_win_browsertest.cc index 580a8fe..2199a07 100644 --- a/chrome/browser/accessibility_win_browsertest.cc +++ b/chrome/browser/accessibility_win_browsertest.cc @@ -19,13 +19,6 @@ namespace { class AccessibilityWinBrowserTest : public InProcessBrowserTest { - public: - void SetUpCommandLine(CommandLine* command_line) { - // Turns on the accessibility in the renderer. Off by default until - // http://crbug.com/25564 is fixed. - command_line->AppendSwitch(switches::kEnableRendererAccessibility); - } - protected: IAccessible* GetRenderWidgetHostViewClientAccessible(); }; @@ -181,6 +174,20 @@ void AccessibleChecker::CheckAccessibleChildren(IAccessible* parent) { IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, TestRendererAccessibilityTree) { + // By requesting an accessible chrome will believe a screen reader has been + // detected. + ScopedComPtr<IAccessible> document_accessible( + GetRenderWidgetHostViewClientAccessible()); + + // The initial accessible returned should have state STATE_SYSTEM_BUSY while + // the accessibility tree is being requested from the renderer. + VARIANT var_state; + HRESULT hr = document_accessible-> + get_accState(CreateI4Variant(CHILDID_SELF), &var_state); + EXPECT_EQ(hr, S_OK); + EXPECT_EQ(V_VT(&var_state), VT_I4); + EXPECT_EQ(V_I4(&var_state), STATE_SYSTEM_BUSY); + GURL tree_url( "data:text/html,<html><head><title>Accessibility Win Test</title></head>" "<body><input type='button' value='push' /><input type='checkbox' />" @@ -189,8 +196,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, ui_test_utils::WaitForNotification( NotificationType::RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED); - ScopedComPtr<IAccessible> document_accessible( - GetRenderWidgetHostViewClientAccessible()); + document_accessible = GetRenderWidgetHostViewClientAccessible(); ASSERT_NE(document_accessible.get(), reinterpret_cast<IAccessible*>(NULL)); AccessibleChecker button_checker(L"push", ROLE_SYSTEM_PUSHBUTTON); @@ -208,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, // Check that document accessible has a parent accessible. ScopedComPtr<IDispatch> parent_dispatch; - HRESULT hr = document_accessible->get_accParent(parent_dispatch.Receive()); + hr = document_accessible->get_accParent(parent_dispatch.Receive()); EXPECT_EQ(hr, S_OK); EXPECT_NE(parent_dispatch, reinterpret_cast<IDispatch*>(NULL)); |