summaryrefslogtreecommitdiffstats
path: root/src/core/render_widget_host_view_qt.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-07 17:51:13 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-11 14:33:48 +0200
commit1df15a830112bb6df104a94453105c74ada0fbf5 (patch)
tree077f59d272bfb3b5f5f6da9a127eaab87615b32c /src/core/render_widget_host_view_qt.h
parent6ac1bf6434f2a508b895f6da7997bd90a5a8c08a (diff)
Implement functions of BrowserAccessibilityDelegate
This is in line with how other platforms do it. Change-Id: Ia258511d3fa35387a69c81c9c02c181fc2995e6c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/render_widget_host_view_qt.h')
-rw-r--r--src/core/render_widget_host_view_qt.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 66cbef501..7f2090995 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -44,7 +44,6 @@
#include "render_widget_host_view_qt_delegate.h"
-#include "browser_accessibility_delegate_qt.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "cc/resources/transferable_resource.h"
@@ -93,6 +92,7 @@ class RenderWidgetHostViewQt
, public ui::GestureConsumer
, public ui::GestureEventHelper
, public RenderWidgetHostViewQtDelegateClient
+ , public content::BrowserAccessibilityDelegate
, public base::SupportsWeakPtr<RenderWidgetHostViewQt>
{
public:
@@ -210,6 +210,15 @@ public:
#endif // defined(USE_AURA)
#endif // defined(OS_WIN)
+ // Overridden from content::BrowserAccessibilityDelegate
+ virtual void SetAccessibilityFocus(int acc_obj_id) Q_DECL_OVERRIDE;
+ virtual void AccessibilityDoDefaultAction(int acc_obj_id) Q_DECL_OVERRIDE;
+ virtual void AccessibilityScrollToMakeVisible(int acc_obj_id, gfx::Rect subfocus) Q_DECL_OVERRIDE;
+ virtual void AccessibilityScrollToPoint(int acc_obj_id, gfx::Point point) Q_DECL_OVERRIDE;
+ virtual void AccessibilitySetTextSelection(int acc_obj_id, int start_offset, int end_offset) Q_DECL_OVERRIDE;
+ virtual gfx::Point GetLastTouchEventLocation() const Q_DECL_OVERRIDE;
+ virtual void FatalAccessibilityTreeError() Q_DECL_OVERRIDE;
+
QAccessibleInterface *GetQtAccessible();
private:
@@ -230,7 +239,6 @@ private:
QMap<int, int> m_touchIdMapping;
blink::WebTouchEvent m_accumTouchEvent;
scoped_ptr<RenderWidgetHostViewQtDelegate> m_delegate;
- scoped_ptr<BrowserAccessibilityDelegateQt> m_accessibilityDelegate;
QExplicitlySharedDataPointer<DelegatedFrameNodeData> m_frameNodeData;
cc::ReturnedResourceArray m_resourcesToRelease;