Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(794)

Unified Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 116293005: Refactor content/ to use ui::AXNodeData instead of blink. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update content/DEPS instead of subdirs Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_view_host_impl.h
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index dbb1956e2bd845b19f25d27f4b14fe53533b39a6..24f8b88953e1e8705b2a4a5e9da7194a0efd9d13 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -15,7 +15,6 @@
#include "base/process/kill.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/common/drag_event_source_info.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/render_view_host.h"
@@ -28,6 +27,7 @@
#include "third_party/WebKit/public/web/WebPopupType.h"
#include "third_party/WebKit/public/web/WebTextDirection.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/accessibility/ax_node_data.h"
#include "ui/base/window_open_disposition.h"
class SkBitmap;
@@ -53,6 +53,7 @@ class Range;
}
namespace ui {
+class AXTree;
struct SelectedFileInfo;
}
@@ -437,14 +438,15 @@ class CONTENT_EXPORT RenderViewHostImpl
// renderer process, and the accessibility tree it sent can be
// retrieved using accessibility_tree_for_testing().
void SetAccessibilityCallbackForTesting(
- const base::Callback<void(blink::WebAXEvent)>& callback);
+ const base::Callback<void(ui::AXEvent)>& callback);
// Only valid if SetAccessibilityCallbackForTesting was called and
// the callback was run at least once. Returns a snapshot of the
// accessibility tree received from the renderer as of the last time
- // a LoadComplete or LayoutComplete accessibility notification was received.
- const AccessibilityNodeDataTreeNode& accessibility_tree_for_testing() {
- return accessibility_tree_;
+ // an accessibility notification was received.
+ const ui::AXTree& ax_tree_for_testing() {
+ CHECK(ax_tree_.get());
+ return *ax_tree_.get();
}
// Set accessibility callbacks.
@@ -693,10 +695,10 @@ class CONTENT_EXPORT RenderViewHostImpl
std::map<int, JavascriptResultCallback> javascript_callbacks_;
// Accessibility callback for testing.
- base::Callback<void(blink::WebAXEvent)> accessibility_testing_callback_;
+ base::Callback<void(ui::AXEvent)> accessibility_testing_callback_;
// The most recently received accessibility tree - for testing only.
- AccessibilityNodeDataTreeNode accessibility_tree_;
+ scoped_ptr<ui::AXTree> ax_tree_;
// True if the render view can be shut down suddenly.
bool sudden_termination_allowed_;

Powered by Google App Engine
This is Rietveld 408576698