Add support for UIA accessibility interfaces like IAccessibleEx and IRawElementProviderSimple.

content/browser/accessibility/browser_accessibility_win.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <oleacc.h>
 
+#include <UIAutomationCore.h>

[dmazzoni, 2012/04/04 06:02:00]

Nit: Group this with the other Windows includes, above - rather than with STL
includes

[ananta, 2012/04/04 19:23:00]

Done.

 #include <vector>
 
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/common/content_export.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "third_party/isimpledom/ISimpleDOMDocument.h"
 #include "third_party/isimpledom/ISimpleDOMNode.h"
 #include "third_party/isimpledom/ISimpleDOMText.h"
 #include "webkit/glue/webaccessibility.h"
 
@@ skipping 24 matching lines @@
       public IAccessibleHyperlink,
       public IAccessibleHypertext,
       public IAccessibleImage,
       public IAccessibleTable,
       public IAccessibleTable2,
       public IAccessibleTableCell,
       public IAccessibleValue,
       public IServiceProvider,
       public ISimpleDOMDocument,
       public ISimpleDOMNode,
-      public ISimpleDOMText {
+      public ISimpleDOMText,
+      public IAccessibleEx,
+      public IRawElementProviderSimple {
  public:
   BEGIN_COM_MAP(BrowserAccessibilityWin)
     COM_INTERFACE_ENTRY2(IDispatch, IAccessible2)
     COM_INTERFACE_ENTRY2(IAccessible, IAccessible2)
     COM_INTERFACE_ENTRY2(IAccessibleText, IAccessibleHypertext)
     COM_INTERFACE_ENTRY(IAccessible2)
     COM_INTERFACE_ENTRY(IAccessibleHyperlink)
     COM_INTERFACE_ENTRY(IAccessibleHypertext)
     COM_INTERFACE_ENTRY(IAccessibleImage)
     COM_INTERFACE_ENTRY(IAccessibleTable)
     COM_INTERFACE_ENTRY(IAccessibleTable2)
     COM_INTERFACE_ENTRY(IAccessibleTableCell)
     COM_INTERFACE_ENTRY(IAccessibleValue)
     COM_INTERFACE_ENTRY(IServiceProvider)
     COM_INTERFACE_ENTRY(ISimpleDOMDocument)
     COM_INTERFACE_ENTRY(ISimpleDOMNode)
     COM_INTERFACE_ENTRY(ISimpleDOMText)
+    COM_INTERFACE_ENTRY(IAccessibleEx)
+    COM_INTERFACE_ENTRY(IRawElementProviderSimple)
   END_COM_MAP()
 
   // Represents a non-static text node in IAccessibleHypertext. This character
   // is embedded in the response to IAccessibleText::get_text, indicating the
   // position where a non-static text child object appears.
   CONTENT_EXPORT static const char16 kEmbeddedCharacter[];
 
   // Mappings from roles and states to human readable strings. Initialize
   // with |InitializeStringMaps|.
   static std::map<int32, string16> role_string_map;
   static std::map<int32, string16> state_string_map;
 
   CONTENT_EXPORT BrowserAccessibilityWin();
 
   CONTENT_EXPORT virtual ~BrowserAccessibilityWin();
 
   //
   // BrowserAccessibility methods.
   //
   CONTENT_EXPORT virtual void PreInitialize();
-CONTENT_EXPORT virtual void PostInitialize();
+  CONTENT_EXPORT virtual void PostInitialize();
   CONTENT_EXPORT virtual void NativeAddReference();
   CONTENT_EXPORT virtual void NativeReleaseReference();
 
   //
   // IAccessible methods.
   //
 
   // Performs the default action on a given object.
   CONTENT_EXPORT STDMETHODIMP accDoDefaultAction(VARIANT var_id);
 
@@ skipping 579 matching lines @@
     return E_NOTIMPL;
   }
 
   //
   // IServiceProvider methods.
   //
 
   CONTENT_EXPORT STDMETHODIMP QueryService(REFGUID guidService, REFIID riid,
       void** object);
 
+  // IAccessibleEx methods not implemented.

[dmazzoni, 2012/04/04 06:02:00]

Nit: Use a large comment block to be consistent:

//
// IAccessibleEx methods not implemented.
//

[ananta, 2012/04/04 19:23:00]

Done.

+  CONTENT_EXPORT STDMETHODIMP GetObjectForChild(long child_id,
+                                                IAccessibleEx** ret) {
+    return E_NOTIMPL;
+  }
+
+  CONTENT_EXPORT STDMETHODIMP GetIAccessiblePair(IAccessible** acc,
+                                                 long* child_id) {
+    return E_NOTIMPL;
+  }
+
+  CONTENT_EXPORT STDMETHODIMP GetRuntimeId(SAFEARRAY** runtime_id) {
+    return E_NOTIMPL;
+  }
+
+  CONTENT_EXPORT STDMETHODIMP ConvertReturnedElement(
+      IRawElementProviderSimple* element,
+      IAccessibleEx** acc) {
+    return E_NOTIMPL;
+  }
+
+  // IRawElementProviderSimple methods.

[dmazzoni, 2012/04/04 06:02:00]

Same

[ananta, 2012/04/04 19:23:00]

Done.

+  // The GetPatternProvider/GetPropertyValue methods need to be implemented for
+  // the on screen keyboard to show up in Windows 8 metro.

[dmazzoni, 2012/04/04 06:02:00]

Nit: on screen -> on-screen.

[ananta, 2012/04/04 19:23:00]

Done.

+  CONTENT_EXPORT STDMETHOD(GetPatternProvider)(PATTERNID id,
+                                               IUnknown** provider);
+  CONTENT_EXPORT STDMETHOD(GetPropertyValue)(PROPERTYID id, VARIANT* ret);

[dmazzoni, 2012/04/04 06:02:00]

Does it work if you use STDMETHODIMP GetPropertyValue(...) rather than
STDMETHOD(GetPropertyValue)(...) to be consistent?

[ananta, 2012/04/04 19:23:00]

Done.

+
+  // IRawElementProviderSimple methods not implemented.
+  CONTENT_EXPORT STDMETHOD(get_ProviderOptions)(enum ProviderOptions* ret) {
+    return E_NOTIMPL;
+  }
+
+  CONTENT_EXPORT STDMETHOD(get_HostRawElementProvider)(
+      IRawElementProviderSimple** provider) {
+    return E_NOTIMPL;
+  }
+
   //
   // CComObjectRootEx methods.
   //
 
   CONTENT_EXPORT HRESULT WINAPI InternalQueryInterface(void* this_ptr,
       const _ATL_INTMAP_ENTRY* entries,
       REFIID iid,
       void** object);
 
   // Accessors to IA2 role and state.
@@ skipping 105 matching lines @@
   std::vector<int32> hyperlinks_;
 
   // Give BrowserAccessibility::Create access to our constructor.
   friend class BrowserAccessibility;
   friend class BrowserAccessibilityRelation;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin);
 };
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_