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

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

Issue 23651003: Use Blink accessibility enums in Chromium (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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
Index: content/browser/accessibility/browser_accessibility_manager_android.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager_android.cc b/content/browser/accessibility/browser_accessibility_manager_android.cc
index e14aa0bb977b44f43e647f347a82f17dc67a815c..a4c1965b2418fd57510dedc2bcf33df182686e5c 100644
--- a/content/browser/accessibility/browser_accessibility_manager_android.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_android.cc
@@ -77,40 +77,40 @@ BrowserAccessibilityManagerAndroid::~BrowserAccessibilityManagerAndroid() {
AccessibilityNodeData BrowserAccessibilityManagerAndroid::GetEmptyDocument() {
AccessibilityNodeData empty_document;
empty_document.id = 0;
- empty_document.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
- empty_document.state = 1 << AccessibilityNodeData::STATE_READONLY;
+ empty_document.role = WebKit::WebAXRoleRootWebArea;
+ empty_document.state = 1 << WebKit::WebAXStateReadonly;
return empty_document;
}
void BrowserAccessibilityManagerAndroid::NotifyAccessibilityEvent(
- int type,
+ WebKit::WebAXEvent event_type,
BrowserAccessibility* node) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
if (obj.is_null())
return;
- switch (type) {
- case AccessibilityNotificationLoadComplete:
+ switch (event_type) {
+ case WebKit::WebAXEventLoadComplete:
Java_BrowserAccessibilityManager_handlePageLoaded(
env, obj.obj(), focus_->renderer_id());
break;
- case AccessibilityNotificationFocusChanged:
+ case WebKit::WebAXEventFocus:
Java_BrowserAccessibilityManager_handleFocusChanged(
env, obj.obj(), node->renderer_id());
break;
- case AccessibilityNotificationCheckStateChanged:
+ case WebKit::WebAXEventCheckedStateChanged:
Java_BrowserAccessibilityManager_handleCheckStateChanged(
env, obj.obj(), node->renderer_id());
break;
- case AccessibilityNotificationScrolledToAnchor:
+ case WebKit::WebAXEventScrolledToAnchor:
Java_BrowserAccessibilityManager_handleScrolledToAnchor(
env, obj.obj(), node->renderer_id());
break;
- case AccessibilityNotificationAlert:
+ case WebKit::WebAXEventAlert:
// An alert is a special case of live region. Fall through to the
// next case to handle it.
- case AccessibilityNotificationObjectShow: {
+ case WebKit::WebAXEventShow: {
// This event is fired when an object appears in a live region.
// Speak its text.
BrowserAccessibilityAndroid* android_node =
@@ -121,13 +121,13 @@ void BrowserAccessibilityManagerAndroid::NotifyAccessibilityEvent(
env, android_node->GetText()).obj());
break;
}
- case AccessibilityNotificationSelectedTextChanged:
+ case WebKit::WebAXEventSelectedTextChanged:
Java_BrowserAccessibilityManager_handleTextSelectionChanged(
env, obj.obj(), node->renderer_id());
break;
- case AccessibilityNotificationChildrenChanged:
- case AccessibilityNotificationTextChanged:
- case AccessibilityNotificationValueChanged:
+ case WebKit::WebAXEventChildrenChanged:
+ case WebKit::WebAXEventTextChanged:
+ case WebKit::WebAXEventValueChanged:
if (node->IsEditableText()) {
Java_BrowserAccessibilityManager_handleEditableTextChanged(
env, obj.obj(), node->renderer_id());

Powered by Google App Engine
This is Rietveld 408576698