| Index: content/renderer/accessibility/renderer_accessibility.h
|
| diff --git a/content/renderer/accessibility/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h
|
| index 1f9fd3614e05b0d0901567312e4cce53172fb0aa..353371690fffdc9d24a59edfcc2384a6f4c04a2f 100644
|
| --- a/content/renderer/accessibility/renderer_accessibility.h
|
| +++ b/content/renderer/accessibility/renderer_accessibility.h
|
| @@ -6,7 +6,7 @@
|
| #define CONTENT_RENDERER_ACCESSIBILITY_RENDERER_ACCESSIBILITY_H_
|
|
|
| #include "content/common/accessibility_messages.h"
|
| -#include "content/public/renderer/render_view_observer.h"
|
| +#include "content/public/renderer/render_frame_observer.h"
|
| #include "third_party/WebKit/public/web/WebAXObject.h"
|
|
|
| namespace blink {
|
| @@ -14,7 +14,7 @@ class WebDocument;
|
| };
|
|
|
| namespace content {
|
| -class RenderViewImpl;
|
| +class RenderFrameImpl;
|
|
|
| enum RendererAccessibilityType {
|
| // Turns on Blink accessibility and provides a full accessibility
|
| @@ -58,14 +58,15 @@ enum RendererAccessibilityType {
|
| // to support opening the on-screen keyboard in response to
|
| // touch events on Windows 8 in Metro mode.
|
| //
|
| -class CONTENT_EXPORT RendererAccessibility : public RenderViewObserver {
|
| +class CONTENT_EXPORT RendererAccessibility : public RenderFrameObserver {
|
| public:
|
| - explicit RendererAccessibility(RenderViewImpl* render_view);
|
| + explicit RendererAccessibility(RenderFrameImpl* render_frame);
|
| virtual ~RendererAccessibility();
|
|
|
| // Called when an accessibility notification occurs in Blink.
|
| virtual void HandleWebAccessibilityEvent(
|
| const blink::WebAXObject& obj, blink::WebAXEvent event) = 0;
|
| + virtual void FocusedNodeChanged(const blink::WebNode& node) = 0;
|
|
|
| // Gets the type of this RendererAccessibility object. Primarily intended for
|
| // testing.
|
| @@ -80,8 +81,8 @@ class CONTENT_EXPORT RendererAccessibility : public RenderViewObserver {
|
| const std::string AccessibilityEventToString(ui::AXEvent event);
|
| #endif
|
|
|
| - // The RenderViewImpl that owns us.
|
| - RenderViewImpl* render_view_;
|
| + // The RenderFrameImpl that owns us.
|
| + RenderFrameImpl* render_frame_;
|
|
|
| // True if verbose logging of accessibility events is on.
|
| bool logging_;
|
|
|