Refactor all accessibility code out of webkit/glue.

content/browser/renderer_host/render_view_host_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_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/process_util.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/site_instance_impl.h"
+#include "content/common/accessibility_node_data.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/javascript_message_type.h"
 #include "content/public/common/window_container_type.h"
 #include "net/base/load_states.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
-#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class ChildProcessSecurityPolicyImpl;
 class SessionStorageNamespaceImpl;
 class SkBitmap;
 class ViewMsg_Navigate;
 struct AccessibilityHostMsg_NotificationParams;
 struct MediaPlayerAction;
 struct ViewHostMsg_CreateWindow_Params;
 struct ViewHostMsg_DidFailProvisionalLoadWithError_Params;
 struct ViewHostMsg_ShowPopup_Params;
 struct ViewMsg_Navigate_Params;
 struct ViewMsg_PostMessage_Params;
 struct ViewMsg_StopFinding_Params;
 
 namespace base {
 class ListValue;
 }
 
 namespace content {
 class TestRenderViewHost;
 class PowerSaveBlocker;
 }
 
 namespace ui {
 class Range;
 }
 
-namespace webkit_glue {
-struct WebAccessibility;
-}
-
 namespace content {
 
 class SessionStorageNamespace;
 class RenderViewHostObserver;
 class RenderWidgetHostDelegate;
 struct FileChooserParams;
 struct ContextMenuParams;
 struct Referrer;
 struct SelectedFileInfo;
 struct ShowDesktopNotificationHostMsgParams;
@@ skipping 334 matching lines @@
   void SendOrientationChangeEvent(int orientation);
 
   void set_save_accessibility_tree_for_testing(bool save) {
     save_accessibility_tree_for_testing_ = save;
   }
 
   void set_send_accessibility_updated_notifications(bool send) {
     send_accessibility_updated_notifications_ = send;
   }
 
-  const webkit_glue::WebAccessibility& accessibility_tree_for_testing() {
+  const AccessibilityNodeData& accessibility_tree_for_testing() {
     return accessibility_tree_;
   }
 
   bool is_waiting_for_unload_ack_for_testing() {
     return is_waiting_for_unload_ack_;
   }
 
   // Checks that the given renderer can request |url|, if not it sets it to
   // about:blank.
   // empty_allowed must be set to false for navigations for security reasons.
@@ skipping 210 matching lines @@
   scoped_refptr<SessionStorageNamespaceImpl> session_storage_namespace_;
 
   // Whether the accessibility tree should be saved, for unit testing.
   bool save_accessibility_tree_for_testing_;
 
   // Whether accessibility notifications are sent for all WebKit notifications
   // for unit testing.
   bool send_accessibility_updated_notifications_;
 
   // The most recently received accessibility tree - for unit testing only.
-  webkit_glue::WebAccessibility accessibility_tree_;
+  AccessibilityNodeData accessibility_tree_;
 
   // The termination status of the last render view that terminated.
   base::TerminationStatus render_view_termination_status_;
 
   // Holds PowerSaveBlockers for the media players in use. Key is the
   // player_cookie passed to OnMediaNotification, value is the PowerSaveBlocker.
   typedef std::map<int64, content::PowerSaveBlocker*> PowerSaveBlockerMap;
   PowerSaveBlockerMap power_save_blockers_;
 
   // A list of observers that filter messages.  Weak references.
   ObserverList<RenderViewHostObserver> observers_;
 
   // When the last ShouldClose message was sent.
   base::TimeTicks send_should_close_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_