Use Blink accessibility enums in Chromium

content/browser/accessibility/browser_accessibility_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "content/common/accessibility_node_data.h"

[aboxhall, 2013/08/29 00:59:06]

Remove?

[dmazzoni, 2013/08/29 04:47:15]

No, this one is used.

 #include "content/common/content_export.h"
+#include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "ui/gfx/native_widget_types.h"
 
-struct AccessibilityHostMsg_NotificationParams;
+struct AccessibilityHostMsg_EventParams;
 
 namespace content {
 class BrowserAccessibility;
 #if defined(OS_WIN)
 class BrowserAccessibilityManagerWin;
 #endif
 
 // Class that can perform actions on behalf of the BrowserAccessibilityManager.
 class CONTENT_EXPORT BrowserAccessibilityDelegate {
  public:
@@ skipping 30 matching lines @@
       const AccessibilityNodeData& src,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
   virtual ~BrowserAccessibilityManager();
 
   void Initialize(const AccessibilityNodeData src);
 
   static AccessibilityNodeData GetEmptyDocument();
 
-  // Type is enum AccessibilityNotification.
-  // We pass it as int so that we don't include the message declaration
-  // header here.
   virtual void NotifyAccessibilityEvent(
-      int type,
-      BrowserAccessibility* node) { }
+      WebKit::WebAXEvent event_type, BrowserAccessibility* node) { }
 
   // Return a pointer to the root of the tree, does not make a new reference.
   BrowserAccessibility* GetRoot();
 
   // Removes a node from the manager.
   virtual void RemoveNode(BrowserAccessibility* node);
 
   // Return a pointer to the object corresponding to the given renderer_id,
   // does not make a new reference.
   BrowserAccessibility* GetFromRendererID(int32 renderer_id);
@@ skipping 35 matching lines @@
 
   // Tell the renderer to set the text selection on a node.
   void SetTextSelection(
       const BrowserAccessibility& node, int start_offset, int end_offset);
 
   // Retrieve the bounds of the parent View in screen coordinates.
   gfx::Rect GetViewBounds();
 
   // Called when the renderer process has notified us of about tree changes.
   // Send a notification to MSAA clients of the change.
-  void OnAccessibilityNotifications(
-      const std::vector<AccessibilityHostMsg_NotificationParams>& params);
+  void OnAccessibilityEvents(
+      const std::vector<AccessibilityHostMsg_EventParams>& params);
 
 #if defined(OS_WIN)
   BrowserAccessibilityManagerWin* ToBrowserAccessibilityManagerWin();
 #endif
 
   // Return the object that has focus, if it's a descandant of the
   // given root (inclusive). Does not make a new reference.
   BrowserAccessibility* GetFocus(BrowserAccessibility* root);
 
   // Is the on-screen keyboard allowed to be shown, in response to a
   // focus event on a text box?
   bool IsOSKAllowed(const gfx::Rect& bounds);
 
   // True by default, but some platforms want to treat the root
   // scroll offsets separately.
   virtual bool UseRootScrollOffsetsWhenComputingBounds();
 
   // For testing only: update the given nodes as if they were
-  // received from the renderer process in OnAccessibilityNotifications.
+  // received from the renderer process in OnAccessibilityEvents.
   // Takes up to 7 nodes at once so tests don't need to create a vector
   // each time.
   void UpdateNodesForTesting(
       const AccessibilityNodeData& node,
       const AccessibilityNodeData& node2 = AccessibilityNodeData(),
       const AccessibilityNodeData& node3 = AccessibilityNodeData(),
       const AccessibilityNodeData& node4 = AccessibilityNodeData(),
       const AccessibilityNodeData& node5 = AccessibilityNodeData(),
       const AccessibilityNodeData& node6 = AccessibilityNodeData(),
       const AccessibilityNodeData& node7 = AccessibilityNodeData());
@@ skipping 67 matching lines @@
 
   // A mapping from renderer IDs to BrowserAccessibility objects.
   base::hash_map<int32, BrowserAccessibility*> renderer_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_