Removes all use of COM and dependencies on Windows-specific classes (includin...

chrome/browser/browser_accessibility.h

 // Copyright (c) 2006-2008 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 CHROME_BROWSER_BROWSER_ACCESSIBILITY_H_
 #define CHROME_BROWSER_BROWSER_ACCESSIBILITY_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include <oleacc.h>
 
 #include "base/basictypes.h"
+#include "webkit/glue/webaccessibility.h"
 
-struct AccessibilityOutParams;
+using webkit_glue::WebAccessibility;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BrowserAccessibility
 //
 // Class implementing the MSAA IAccessible COM interface for the
 // Browser-Renderer communication of MSAA information, providing accessibility
 // to be used by screen readers and other assistive technology (AT).
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 100 matching lines @@
   VARIANT EmptyVariant() const {
     VARIANT empty;
     empty.vt = VT_EMPTY;
     return empty;
   }
 
   // Wrapper functions, calling through to singleton instance of
   // BrowserAccessibilityManager.
 
   // Creates an instance of BrowserAccessibility, initializes it and sets the
-  // |iaccessible_id| and |parent_id|.
+  // [iaccessible_id] and [parent_id].
   STDMETHODIMP CreateInstance(REFIID iid,
                               int iaccessible_id,
                               void** interface_ptr);
 
   // Composes and sends a message for requesting needed accessibility
   // information. Unused LONG input parameters should be NULL, and the VARIANT
   // an empty, valid instance.
   bool RequestAccessibilityInfo(int iaccessible_func_id,
                                 VARIANT var_id,
                                 LONG input1, LONG input2);
 
   // Accessors.
-  const AccessibilityOutParams& response();
+  const WebAccessibility::OutParams& response();
   HWND parent_hwnd();
 
+  // Returns a conversion from the BrowserAccessibilityRole (as defined in
+  // webkit/glue/webaccessibility.h) to an MSAA role.
+  long MSAARole(long browser_accessibility_role);
+
+  // Returns a conversion from the BrowserAccessibilityState (as defined in
+  // webkit/glue/webaccessibility.h) to MSAA states set.
+  long MSAAState(long browser_accessibility_state);
+
   // Id to uniquely distinguish this instance in the render-side caching,
   // mapping it to the correct IAccessible on that side. Initialized to -1.
   int iaccessible_id_;
 
   // The unique id of this IAccessible instance. Used to help
   // BrowserAccessibilityManager instance retrieve the correct member
   // variables for this process.
   int instance_id_;
 
   // The instance should only be active if there is a non-terminated
   // RenderProcessHost associated with it. The BrowserAccessibilityManager keeps
   // track of this state, and sets it to false to disable all calls into the
   // renderer from this instance of BroweserAccessibility, and have all
   // IAccessible functions return E_FAIL.
   bool instance_active_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 #endif  // CHROME_BROWSER_BROWSER_ACCESSIBILITY_H_