Index: ui/views/accessibility/native_view_accessibility_win.h |
=================================================================== |
--- ui/views/accessibility/native_view_accessibility_win.h (revision 130412) |
+++ ui/views/accessibility/native_view_accessibility_win.h (working copy) |
@@ -10,6 +10,7 @@ |
#include <atlcom.h> |
#include <oleacc.h> |
+#include <UIAutomationCore.h> |
#include "base/memory/scoped_ptr.h" |
#include "third_party/iaccessible2/ia2_api_all.h" |
@@ -40,7 +41,9 @@ |
public IDispatchImpl<IAccessible2, &IID_IAccessible2, |
&LIBID_IAccessible2Lib>, |
public IAccessibleText, |
- public IServiceProvider { |
+ public IServiceProvider, |
+ public IAccessibleEx, |
+ public IRawElementProviderSimple { |
public: |
BEGIN_COM_MAP(NativeViewAccessibilityWin) |
COM_INTERFACE_ENTRY2(IDispatch, IAccessible2) |
@@ -48,6 +51,8 @@ |
COM_INTERFACE_ENTRY(IAccessible2) |
COM_INTERFACE_ENTRY(IAccessibleText) |
COM_INTERFACE_ENTRY(IServiceProvider) |
+ COM_INTERFACE_ENTRY(IAccessibleEx) |
+ COM_INTERFACE_ENTRY(IRawElementProviderSimple) |
END_COM_MAP() |
// Create method for view accessibility. |
@@ -286,6 +291,35 @@ |
STDMETHODIMP QueryService(REFGUID guidService, REFIID riid, void** object); |
+ // IAccessibleEx methods not implemented. |
dmazzoni
2012/04/04 06:02:00
Nit: same
ananta
2012/04/04 19:23:00
Done.
|
+ STDMETHODIMP GetObjectForChild(long child_id, IAccessibleEx** ret) { |
+ return E_NOTIMPL; |
+ } |
+ STDMETHODIMP GetIAccessiblePair(IAccessible** acc, long* child_id) { |
+ return E_NOTIMPL; |
+ } |
+ STDMETHODIMP GetRuntimeId(SAFEARRAY** runtime_id) { |
+ return E_NOTIMPL; |
+ } |
+ STDMETHODIMP ConvertReturnedElement(IRawElementProviderSimple* element, |
+ IAccessibleEx** acc) { |
+ return E_NOTIMPL; |
+ } |
+ |
+ // IRawElementProviderSimple methods. |
+ // The GetPatternProvider/GetPropertyValue methods need to be implemented for |
+ // the on screen keyboard to show up in Windows 8 metro. |
+ STDMETHOD(GetPatternProvider)(PATTERNID id, IUnknown** provider); |
+ STDMETHOD(GetPropertyValue)(PROPERTYID id, VARIANT* ret); |
+ |
+ // IRawElementProviderSimple methods not implemented. |
+ STDMETHOD(get_ProviderOptions)(enum ProviderOptions* ret) { |
+ return E_NOTIMPL; |
+ } |
+ STDMETHOD(get_HostRawElementProvider)(IRawElementProviderSimple** provider) { |
+ return E_NOTIMPL; |
+ } |
+ |
// Returns a conversion from the event (as defined in accessibility_types.h) |
// to an MSAA event. |
static int32 MSAAEvent(ui::AccessibilityTypes::Event event); |