Use Blink accessibility enums in Chromium

content/renderer/accessibility/renderer_accessibility_focus_only.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/accessibility/renderer_accessibility_focus_only.h"
 
 #include "content/common/accessibility_node_data.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
@@ skipping 17 matching lines @@
 
 RendererAccessibilityFocusOnly::RendererAccessibilityFocusOnly(
     RenderViewImpl* render_view)
     : RendererAccessibility(render_view),
       next_id_(kInitialId) {
 }
 
 RendererAccessibilityFocusOnly::~RendererAccessibilityFocusOnly() {
 }
 
-void RendererAccessibilityFocusOnly::HandleWebAccessibilityNotification(
-    const WebKit::WebAccessibilityObject& obj,
-    WebKit::WebAccessibilityNotification notification) {
+void RendererAccessibilityFocusOnly::HandleWebAccessibilityEvent(
+    const WebKit::WebAXObject& obj, WebKit::WebAXEvent event) {
   // Do nothing.
 }
 
 void RendererAccessibilityFocusOnly::FocusedNodeChanged(const WebNode& node) {
   // Send the new accessible tree and post a native focus event.
   HandleFocusedNodeChanged(node, true);
 }
 
 void RendererAccessibilityFocusOnly::DidFinishLoad(WebKit::WebFrame* frame) {
   WebView* view = render_view()->GetWebView();
@@ skipping 22 matching lines @@
   // checking the focused node in WebKit.
   if (render_view_->HasIMETextFocus()) {
     node_has_focus = true;
     node_is_editable_text = true;
   } else {
     node_has_focus = !node.isNull();
     node_is_editable_text =
         node_has_focus && render_view_->IsEditableNode(node);
   }
 
-  std::vector<AccessibilityHostMsg_NotificationParams> notifications;
-  notifications.push_back(AccessibilityHostMsg_NotificationParams());
-  AccessibilityHostMsg_NotificationParams& notification = notifications[0];
+  std::vector<AccessibilityHostMsg_EventParams> events;
+  events.push_back(AccessibilityHostMsg_EventParams());
+  AccessibilityHostMsg_EventParams& event = events[0];
 
   // If we want to update the browser's accessibility tree but not send a
-  // native focus changed notification, we can send a LayoutComplete
-  // notification, which doesn't post a native event on Windows.
-  notification.notification_type =
+  // native focus changed event, we can send a LayoutComplete
+  // event, which doesn't post a native event on Windows.
+  event.event_type =
       send_focus_event ?
-      AccessibilityNotificationFocusChanged :
-      AccessibilityNotificationLayoutComplete;
+      WebKit::WebAXEventFocus :
+      WebKit::WebAXEventLayoutComplete;
 
-  // Set the id that the notification applies to: the root node if nothing
+  // Set the id that the event applies to: the root node if nothing
   // has focus, otherwise the focused node.
-  notification.id = node_has_focus ? next_id_ : 1;
+  event.id = node_has_focus ? next_id_ : 1;
 
-  notification.nodes.resize(2);
-  AccessibilityNodeData& root = notification.nodes[0];
-  AccessibilityNodeData& child = notification.nodes[1];
+  event.nodes.resize(2);
+  AccessibilityNodeData& root = event.nodes[0];
+  AccessibilityNodeData& child = event.nodes[1];
 
   // Always include the root of the tree, the document. It always has id 1.
   root.id = 1;
-  root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  root.role = WebKit::WebAXRoleRootWebArea;
   root.state =
-      (1 << AccessibilityNodeData::STATE_READONLY) |
-      (1 << AccessibilityNodeData::STATE_FOCUSABLE);
+      (1 << WebKit::WebAXStateReadonly) |
+      (1 << WebKit::WebAXStateFocusable);
   if (!node_has_focus)
-    root.state |= (1 << AccessibilityNodeData::STATE_FOCUSED);
+    root.state |= (1 << WebKit::WebAXStateFocused);
   root.location = gfx::Rect(render_view_->size());
   root.child_ids.push_back(next_id_);
 
   child.id = next_id_;
-  child.role = AccessibilityNodeData::ROLE_GROUP;
+  child.role = WebKit::WebAXRoleGroup;
 
   if (!node.isNull() && node.isElementNode()) {
     child.location = gfx::Rect(
         const_cast<WebNode&>(node).to<WebElement>().boundsInViewportSpace());
   } else if (render_view_->HasIMETextFocus()) {
     child.location = root.location;
   } else {
     child.location = gfx::Rect();
   }
 
   if (node_has_focus) {
     child.state =
-        (1 << AccessibilityNodeData::STATE_FOCUSABLE) |
-        (1 << AccessibilityNodeData::STATE_FOCUSED);
+        (1 << WebKit::WebAXStateFocusable) |
+        (1 << WebKit::WebAXStateFocused);
     if (!node_is_editable_text)
-      child.state |= (1 << AccessibilityNodeData::STATE_READONLY);
+      child.state |= (1 << WebKit::WebAXStateReadonly);
   }
 
 #ifndef NDEBUG
   if (logging_) {
     LOG(INFO) << "Accessibility update: \n"
         << "routing id=" << routing_id()
-        << " notification="
-        << AccessibilityNotificationToString(notification.notification_type)
-        << "\n" << notification.nodes[0].DebugString(true);
+        << " event="
+        << AccessibilityEventToString(event.event_type)
+        << "\n" << event.nodes[0].DebugString(true);
   }
 #endif
 
-  Send(new AccessibilityHostMsg_Notifications(routing_id(), notifications));
+  Send(new AccessibilityHostMsg_Events(routing_id(), events));
 
   // Increment the id, wrap back when we get past a million.
   next_id_++;
   if (next_id_ > 1000000)
     next_id_ = kInitialId;
 }
 
 }  // namespace content