| Index: content/renderer/accessibility/renderer_accessibility.h
|
| diff --git a/content/renderer/accessibility/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h
|
| index b10d21f1d9db731280644e0a1062ba2e9966252a..9ddb6ed440562779fd36b2e47a6782d1546c96d3 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_frame_observer.h"
|
| +#include "content/public/renderer/render_view_observer.h"
|
| #include "third_party/WebKit/public/web/WebAXObject.h"
|
|
|
| namespace blink {
|
| @@ -14,7 +14,7 @@
|
| };
|
|
|
| namespace content {
|
| -class RenderFrameImpl;
|
| +class RenderViewImpl;
|
|
|
| enum RendererAccessibilityType {
|
| // Turns on Blink accessibility and provides a full accessibility
|
| @@ -34,9 +34,9 @@
|
| // by automation tools, and Windows 8 uses them to determine when the
|
| // on-screen keyboard should be shown.
|
| //
|
| -// An instance of this class (or rather, a subclass) belongs to RenderFrameImpl.
|
| +// An instance of this class (or rather, a subclass) belongs to RenderViewImpl.
|
| // Accessibility is initialized based on the AccessibilityMode of
|
| -// RenderFrameImpl; it lazily starts as Off or EditableTextOnly depending on
|
| +// RenderViewImpl; it lazily starts as Off or EditableTextOnly depending on
|
| // the operating system, and switches to Complete if assistive technology is
|
| // detected or a flag is set.
|
| //
|
| @@ -58,15 +58,14 @@
|
| // to support opening the on-screen keyboard in response to
|
| // touch events on Windows 8 in Metro mode.
|
| //
|
| -class CONTENT_EXPORT RendererAccessibility : public RenderFrameObserver {
|
| +class CONTENT_EXPORT RendererAccessibility : public RenderViewObserver {
|
| public:
|
| - explicit RendererAccessibility(RenderFrameImpl* render_frame);
|
| + explicit RendererAccessibility(RenderViewImpl* render_view);
|
| 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.
|
| @@ -77,8 +76,8 @@
|
| // no view or frame.
|
| blink::WebDocument GetMainDocument();
|
|
|
| - // The RenderFrameImpl that owns us.
|
| - RenderFrameImpl* render_frame_;
|
| + // The RenderViewImpl that owns us.
|
| + RenderViewImpl* render_view_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RendererAccessibility);
|
| };
|
|
|