Use Blink accessibility enums in Chromium

content/browser/renderer_host/render_view_host_impl.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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 986 matching lines @@
     IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_Cancel,
                         OnCancelDesktopNotification)
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnShowPopup)
 #endif
     IPC_MESSAGE_HANDLER(ViewHostMsg_RunFileChooser, OnRunFileChooser)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidAccessInitialDocument,
                         OnDidAccessInitialDocument)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DomOperationResponse,
                         OnDomOperationResponse)
-    IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Notifications,
-                        OnAccessibilityNotifications)
+    IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Events, OnAccessibilityEvents)
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(
         handled = RenderWidgetHostImpl::OnMessageReceived(msg))
   IPC_END_MESSAGE_MAP_EX()
 
   if (!msg_is_ok) {
     // The message had a handler, but its de-serialization failed.
     // Kill the renderer.
     RecordAction(UserMetricsAction("BadMessageTerminate_RVH"));
     GetProcess()->ReceivedBadMessage();
@@ skipping 773 matching lines @@
 }
 
 void RenderViewHostImpl::DisownOpener() {
   // This should only be called when swapped out.
   DCHECK(is_swapped_out_);
 
   Send(new ViewMsg_DisownOpener(GetRoutingID()));
 }
 
 void RenderViewHostImpl::SetAccessibilityCallbackForTesting(
-    const base::Callback<void(AccessibilityNotification)>& callback) {
+    const base::Callback<void(WebKit::WebAXEvent)>& callback) {
   accessibility_testing_callback_ = callback;
 }
 
 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) {
   Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs));
 }
 
 void RenderViewHostImpl::NotifyTimezoneChange() {
   Send(new ViewMsg_TimezoneChange(GetRoutingID()));
 }
@@ skipping 73 matching lines @@
 }
 
 void RenderViewHostImpl::NotifyMoveOrResizeStarted() {
   Send(new ViewMsg_MoveOrResizeStarted(GetRoutingID()));
 }
 
 void RenderViewHostImpl::StopFinding(StopFindAction action) {
   Send(new ViewMsg_StopFinding(GetRoutingID(), action));
 }
 
-void RenderViewHostImpl::OnAccessibilityNotifications(
-    const std::vector<AccessibilityHostMsg_NotificationParams>& params) {
+void RenderViewHostImpl::OnAccessibilityEvents(
+    const std::vector<AccessibilityHostMsg_EventParams>& params) {
   if (view_ && !is_swapped_out_)
-    view_->OnAccessibilityNotifications(params);
+    view_->OnAccessibilityEvents(params);
 
   // Always send an ACK or the renderer can be in a bad state.
-  Send(new AccessibilityMsg_Notifications_ACK(GetRoutingID()));
+  Send(new AccessibilityMsg_Events_ACK(GetRoutingID()));
 
   // The rest of this code is just for testing; bail out if we're not
   // in that mode.
   if (accessibility_testing_callback_.is_null())
     return;
 
   for (unsigned i = 0; i < params.size(); i++) {
-    const AccessibilityHostMsg_NotificationParams& param = params[i];
-    AccessibilityNotification src_type = param.notification_type;
-    if (src_type == AccessibilityNotificationLayoutComplete ||
-        src_type == AccessibilityNotificationLoadComplete) {
+    const AccessibilityHostMsg_EventParams& param = params[i];
+    WebKit::WebAXEvent src_type = param.event_type;
+    if (src_type == WebKit::WebAXEventLayoutComplete ||
+        src_type == WebKit::WebAXEventLoadComplete) {
       MakeAccessibilityNodeDataTree(param.nodes, &accessibility_tree_);
     }
     accessibility_testing_callback_.Run(src_type);
   }
 }
 
 void RenderViewHostImpl::OnScriptEvalResponse(int id,
                                               const base::ListValue& result) {
   const base::Value* result_value;
   if (!result.Get(0, &result_value)) {
@@ skipping 141 matching lines @@
   const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles();
   for (std::vector<base::FilePath>::const_iterator file = file_paths.begin();
        file != file_paths.end(); ++file) {
     if (!policy->CanReadFile(GetProcess()->GetID(), *file))
       return false;
   }
   return true;
 }
 
 }  // namespace content