Re-land: Create AXAction and AXActionData as a way to simplify accessibility actions

content/renderer/accessibility/render_accessibility_impl.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_RENDERER_ACCESSIBILITY_RENDER_ACCESSIBILITY_IMPL_H_
 #define CONTENT_RENDERER_ACCESSIBILITY_RENDER_ACCESSIBILITY_IMPL_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/ax_content_node_data.h"
 #include "content/public/renderer/render_accessibility.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/renderer/accessibility/blink_ax_tree_source.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
 #include "ui/accessibility/ax_relative_bounds.h"
 #include "ui/accessibility/ax_tree.h"
 #include "ui/accessibility/ax_tree_serializer.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 struct AccessibilityHostMsg_EventParams;
 
 namespace blink {
 class WebDocument;
 class WebNode;
 };
 
+namespace ui {
+struct AXActionData;
+}
+
 namespace content {
 class RenderFrameImpl;
 
 // The browser process implements native accessibility APIs, allowing
 // assistive technology (e.g., screen readers, magnifiers) to access and
 // control the web contents with high-level APIs. These APIs are also used
 // by automation tools, and Windows 8 uses them to determine when the
 // on-screen keyboard should be shown.
 //
 // An instance of this class belongs to RenderFrameImpl. Accessibility is
@@ skipping 68 matching lines @@
   void SendLocationChanges();
 
   // The RenderFrameImpl that owns us.
   RenderFrameImpl* render_frame_;
 
  private:
   // RenderFrameObserver implementation.
   void OnDestruct() override;
 
   // Handlers for messages from the browser to the renderer.
-  void OnDoDefaultAction(int acc_obj_id);
+  void OnPerformAction(const ui::AXActionData& data);
   void OnEventsAck(int ack_token);
   void OnFatalError();
-  void OnHitTest(gfx::Point point);
-  void OnSetAccessibilityFocus(int acc_obj_id);
   void OnReset(int reset_token);
-  void OnScrollToMakeVisible(int acc_obj_id, gfx::Rect subfocus);
-  void OnScrollToPoint(int acc_obj_id, gfx::Point point);
-  void OnSetScrollOffset(int acc_obj_id, gfx::Point offset);
-  void OnSetFocus(int acc_obj_id);
-  void OnSetSelection(int anchor_acc_obj_id,
-                      int anchor_offset,
-                      int focus_acc_obj_id,
-                      int focus_offset);
-  void OnSetValue(int acc_obj_id, base::string16 value);
-  void OnShowContextMenu(int acc_obj_id);
 
+  void OnHitTest(const gfx::Point& point);
+  void OnSetAccessibilityFocus(const blink::WebAXObject& obj);
   void AddPluginTreeToUpdate(AXContentTreeUpdate* update);
   void ScrollPlugin(int id_to_make_visible);
 
   // Events from Blink are collected until they are ready to be
   // sent to the browser.
   std::vector<AccessibilityHostMsg_EventParams> pending_events_;
 
   // The adapter that exposes Blink's accessibility tree to AXTreeSerializer.
   BlinkAXTreeSource tree_source_;
 
@@ skipping 33 matching lines @@
 
   // So we can queue up tasks to be executed later.
   base::WeakPtrFactory<RenderAccessibilityImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderAccessibilityImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_