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

Unified Diff: chrome/browser/accessibility_win_browsertest.cc

Issue 3415008: Remove use of accessible prop service from render_widget_host_view_win.cc... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 3 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
Download patch
« no previous file with comments | « no previous file | chrome/browser/browser_accessibility_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/accessibility_win_browsertest.cc
===================================================================
--- chrome/browser/accessibility_win_browsertest.cc (revision 59589)
+++ chrome/browser/accessibility_win_browsertest.cc (working copy)
@@ -6,6 +6,7 @@
#include <vector>
#include "base/scoped_comptr_win.h"
+#include "chrome/browser/automation/ui_controls.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/renderer_host/render_view_host.h"
@@ -50,6 +51,10 @@
::SendNotifyMessage(
HWND_BROADCAST, WM_SETTINGCHANGE, SPI_GETSCREENREADER, 0);
}
+
+ // If the mouse happens to be on the document then it will have the unexpected
+ // STATE_SYSTEM_HOTTRACKED state. Move it to a non-document location.
+ ui_controls::SendMouseMove(0, 0);
}
void AccessibilityWinBrowserTest::TearDownInProcessBrowserTestFixture() {
@@ -344,20 +349,18 @@
// The initial accessible returned should have state STATE_SYSTEM_BUSY while
// the accessibility tree is being requested from the renderer.
AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
- document_checker.SetExpectedState(STATE_SYSTEM_BUSY);
+ document_checker.SetExpectedState(
+ STATE_SYSTEM_READONLY | STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_FOCUSED |
+ STATE_SYSTEM_BUSY);
document_checker.CheckAccessible(GetRendererAccessible());
- // Wait for the initial accessibility tree to load.
+ // Wait for the initial accessibility tree to load. Busy state should clear.
ui_test_utils::WaitForNotification(
NotificationType::RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED);
+ document_checker.SetExpectedState(
+ STATE_SYSTEM_READONLY | STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_FOCUSED);
+ document_checker.CheckAccessible(GetRendererAccessible());
- // TODO(ctguil): Fix: We should not be expecting busy state here.
- if (0) {
- // Run when above todo is fixed.
- document_checker.SetExpectedState(0L);
- document_checker.CheckAccessible(GetRendererAccessible());
- }
-
GURL tree_url(
"data:text/html,<html><head><title>Accessibility Win Test</title></head>"
"<body><input type='button' value='push' /><input type='checkbox' />"
« no previous file with comments | « no previous file | chrome/browser/browser_accessibility_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698