Expand Chrome OS ARC support to create one tree source per package

chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.h

 // Copyright 2017 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 CHROME_BROWSER_CHROMEOS_ARC_ACCESSIBILITY_AX_TREE_SOURCE_ARC_H_
 #define CHROME_BROWSER_CHROMEOS_ARC_ACCESSIBILITY_AX_TREE_SOURCE_ARC_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "components/arc/common/accessibility_helper.mojom.h"
+#include "ui/accessibility/ax_host_delegate.h"
 #include "ui/accessibility/ax_node.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_serializer.h"
 #include "ui/accessibility/ax_tree_source.h"
 #include "ui/views/view.h"
 
+namespace {
+class FocusStealer;
+}
+
+namespace aura {
+class Window;
+}
+
+namespace views {
+class View;
+}
+
 namespace arc {
 
 using AXTreeArcSerializer =
     ui::AXTreeSerializer<mojom::AccessibilityNodeInfoData*,
                          ui::AXNodeData,
                          ui::AXTreeData>;
 
 // This class represents the accessibility tree from the focused ARC window.
 class AXTreeSourceArc
     : public ui::AXTreeSource<mojom::AccessibilityNodeInfoData*,
                               ui::AXNodeData,
-                              ui::AXTreeData> {
+                              ui::AXTreeData>,
+      public ui::AXHostDelegate {
  public:
-  explicit AXTreeSourceArc(int32_t tree_id);
+  class Delegate {
+   public:
+    virtual void OnAction(const ui::AXActionData& data) = 0;
+  };
+
+  explicit AXTreeSourceArc(Delegate* delegate);
   ~AXTreeSourceArc() override;
 
   // Notify automation of an accessibility event.
   void NotifyAccessibilityEvent(mojom::AccessibilityEventData* event_data);
 
-  int32_t tree_id() const { return tree_id_; }
+  void Focus(aura::Window* window);
 
  private:
   // AXTreeSource overrides.
   bool GetTreeData(ui::AXTreeData* data) const override;
   mojom::AccessibilityNodeInfoData* GetRoot() const override;
   mojom::AccessibilityNodeInfoData* GetFromId(int32_t id) const override;
   int32_t GetId(mojom::AccessibilityNodeInfoData* node) const override;
   void GetChildren(mojom::AccessibilityNodeInfoData* node,
                    std::vector<mojom::AccessibilityNodeInfoData*>* out_children)
       const override;
   mojom::AccessibilityNodeInfoData* GetParent(
       mojom::AccessibilityNodeInfoData* node) const override;
   bool IsValid(mojom::AccessibilityNodeInfoData* node) const override;
   bool IsEqual(mojom::AccessibilityNodeInfoData* node1,
                mojom::AccessibilityNodeInfoData* node2) const override;
   mojom::AccessibilityNodeInfoData* GetNull() const override;
   void SerializeNode(mojom::AccessibilityNodeInfoData* node,
                      ui::AXNodeData* out_data) const override;
 
+  // AXHostDelegate overrides.
+  void PerformAction(const ui::AXActionData& data) override;
+
   // Resets tree state.
   void Reset();
 
-  // The id of this tree.
-  int32_t tree_id_;
-
   // Maps an AccessibilityNodeInfo to its tree data.
   std::map<int32_t, mojom::AccessibilityNodeInfoData*> tree_map_;
   std::map<int32_t, int32_t> parent_map_;
   std::unique_ptr<AXTreeArcSerializer> current_tree_serializer_;
   int32_t root_id_;
   int32_t focused_node_id_;
+  Delegate* delegate_;

[Luis Héctor Chávez, 2017/04/25 15:27:00]

nit: Delegate* const delegate_;

Also mention what the expected lifetime of |delegate_| will be.

[David Tseng, 2017/04/25 22:48:02]

Done.

+  std::unique_ptr<FocusStealer> focus_stealer_;

[Luis Héctor Chávez, 2017/04/25 15:27:00]

nit: As hidehiko@ mentioned previously, please make FocusStealer an internal
class to avoid fwd-declaring stuff in the anonymous namespace in the header
file.

[David Tseng, 2017/04/25 22:48:03]

Forward declared as a private nested class.

 
   DISALLOW_COPY_AND_ASSIGN(AXTreeSourceArc);
 };
 
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ACCESSIBILITY_AX_TREE_SOURCE_ARC_H_