Move some AX attrs from AXNodeData to AXTreeData.

content/renderer/accessibility/renderer_accessibility.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_RENDERER_ACCESSIBILITY_H_
 #define CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
@@ skipping 34 matching lines @@
 // technology. It turns on Blink's accessibility code and sends a serialized
 // representation of that tree whenever it changes. It also handles requests
 // from the browser to perform accessibility actions on nodes in the tree
 // (e.g., change focus, or click on a button).
 class CONTENT_EXPORT RendererAccessibility : public RenderFrameObserver {
  public:
   // Request a one-time snapshot of the accessibility tree without
   // enabling accessibility if it wasn't already enabled.
   static void SnapshotAccessibilityTree(
       RenderFrameImpl* render_frame,
-      ui::AXTreeUpdate<AXContentNodeData>* response);
+      AXContentTreeUpdate* response);
 
   explicit RendererAccessibility(RenderFrameImpl* render_frame);
   ~RendererAccessibility() override;
 
   // RenderFrameObserver implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // Called when an accessibility notification occurs in Blink.
   void HandleWebAccessibilityEvent(const blink::WebAXObject& obj,
                                    blink::WebAXEvent event);
@@ skipping 53 matching lines @@
 
   // 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_;
 
   // The serializer that sends accessibility messages to the browser process.
   using BlinkAXTreeSerializer =
-      ui::AXTreeSerializer<blink::WebAXObject, AXContentNodeData>;
+      ui::AXTreeSerializer<blink::WebAXObject,
+                           AXContentNodeData,
+                           AXContentTreeData>;
   BlinkAXTreeSerializer serializer_;
 
   // Current location of every object, so we can detect when it moves.
   base::hash_map<int, gfx::Rect> locations_;
 
   // The most recently observed scroll offset of the root document element.
   // TODO(dmazzoni): remove once https://bugs.webkit.org/show_bug.cgi?id=73460
   // is fixed.
   gfx::Size last_scroll_offset_;
 
   // Set if we are waiting for an accessibility event ack.
   bool ack_pending_;
 
   // Nonzero if the browser requested we reset the accessibility state.
   // We need to return this token in the next IPC.
   int reset_token_;
 
   // So we can queue up tasks to be executed later.
   base::WeakPtrFactory<RendererAccessibility> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererAccessibility);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_