Make BrowserAccessibilityManager cross platform. Step 1....

chrome/browser/accessibility/browser_accessibility_win.cc

Index: chrome/browser/accessibility/browser_accessibility_win.cc
===================================================================
--- chrome/browser/accessibility/browser_accessibility_win.cc	(revision 0)
+++ chrome/browser/accessibility/browser_accessibility_win.cc	(working copy)
@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browser_accessibility_win.h"
+#include "chrome/browser/accessibility/browser_accessibility_win.h"
 
-#include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browser_accessibility_manager_win.h"
+#include "chrome/browser/accessibility/browser_accessibility_manager_win.h"
 #include "net/base/escape.h"
 
 using webkit_glue::WebAccessibility;
 
-BrowserAccessibility::BrowserAccessibility()
+BrowserAccessibilityWin::BrowserAccessibilityWin()
     : manager_(NULL),
       parent_(NULL),
       child_id_(-1),
@@ -21,13 +20,13 @@
       instance_active_(false) {
 }
 
-BrowserAccessibility::~BrowserAccessibility() {
+BrowserAccessibilityWin::~BrowserAccessibilityWin() {
   InactivateTree();
 }
 
-void BrowserAccessibility::Initialize(
-    BrowserAccessibilityManager* manager,
-    BrowserAccessibility* parent,
+void BrowserAccessibilityWin::Initialize(
+    BrowserAccessibilityManagerWin* manager,
+    BrowserAccessibilityWin* parent,
     LONG child_id,
     LONG index_in_parent,
     const webkit_glue::WebAccessibility& src) {
@@ -62,11 +61,11 @@
   instance_active_ = true;
 }
 
-void BrowserAccessibility::AddChild(BrowserAccessibility* child) {
+void BrowserAccessibilityWin::AddChild(BrowserAccessibilityWin* child) {
   children_.push_back(child);
 }
 
-void BrowserAccessibility::InactivateTree() {
+void BrowserAccessibilityWin::InactivateTree() {
   if (!instance_active_)
     return;
 
@@ -78,7 +77,7 @@
   // references to them, so that as much of the tree as possible will be
   // destroyed now - however, nodes that still have references to them
   // might stick around a while until all clients have released them.
-  for (std::vector<BrowserAccessibility*>::iterator iter =
+  for (std::vector<BrowserAccessibilityWin*>::iterator iter =
            children_.begin();
        iter != children_.end(); ++iter) {
     (*iter)->InactivateTree();
@@ -88,7 +87,8 @@
   manager_->Remove(child_id_);
 }
 
-bool BrowserAccessibility::IsDescendantOf(BrowserAccessibility* ancestor) {
+bool BrowserAccessibilityWin::IsDescendantOf(
+    BrowserAccessibilityWin* ancestor) {
   if (this == ancestor) {
     return true;
   } else if (parent_) {
@@ -98,22 +98,22 @@
   return false;
 }
 
-BrowserAccessibility* BrowserAccessibility::GetParent() {
+BrowserAccessibilityWin* BrowserAccessibilityWin::GetParent() {
   return parent_;
 }
 
-uint32 BrowserAccessibility::GetChildCount() {
+uint32 BrowserAccessibilityWin::GetChildCount() {
   return children_.size();
 }
 
-BrowserAccessibility* BrowserAccessibility::GetPreviousSibling() {
+BrowserAccessibilityWin* BrowserAccessibilityWin::GetPreviousSibling() {
   if (parent_ && index_in_parent_ > 0)
     return parent_->children_[index_in_parent_ - 1];
 
   return NULL;
 }
 
-BrowserAccessibility* BrowserAccessibility::GetNextSibling() {
+BrowserAccessibilityWin* BrowserAccessibilityWin::GetNextSibling() {
   if (parent_ &&
       index_in_parent_ >= 0 &&
       index_in_parent_ < static_cast<int>(parent_->children_.size() - 1)) {
@@ -123,15 +123,15 @@
   return NULL;
 }
 
-void BrowserAccessibility::ReplaceChild(
-    const BrowserAccessibility* old_acc, BrowserAccessibility* new_acc) {
+void BrowserAccessibilityWin::ReplaceChild(
+    const BrowserAccessibilityWin* old_acc, BrowserAccessibilityWin* new_acc) {
   DCHECK_EQ(children_[old_acc->index_in_parent_], old_acc);
 
   old_acc = children_[old_acc->index_in_parent_];
   children_[old_acc->index_in_parent_] = new_acc;
 }
 
-BrowserAccessibility* BrowserAccessibility::NewReference() {
+BrowserAccessibilityWin* BrowserAccessibilityWin::NewReference() {
   AddRef();
   return this;
 }
@@ -145,11 +145,11 @@
 // * Return S_FALSE if the only output is a string argument and it's empty.
 //
 
-HRESULT BrowserAccessibility::accDoDefaultAction(VARIANT var_id) {
+HRESULT BrowserAccessibilityWin::accDoDefaultAction(VARIANT var_id) {
   if (!instance_active_)
     return E_FAIL;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
@@ -157,7 +157,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::accHitTest(LONG x_left, LONG y_top,
+STDMETHODIMP BrowserAccessibilityWin::accHitTest(LONG x_left, LONG y_top,
                                               VARIANT* child) {
   if (!instance_active_)
     return E_FAIL;
@@ -168,7 +168,7 @@
   return E_NOTIMPL;
 }
 
-STDMETHODIMP BrowserAccessibility::accLocation(LONG* x_left, LONG* y_top,
+STDMETHODIMP BrowserAccessibilityWin::accLocation(LONG* x_left, LONG* y_top,
                                                LONG* width, LONG* height,
                                                VARIANT var_id) {
   if (!instance_active_)
@@ -177,13 +177,13 @@
   if (!x_left || !y_top || !width || !height)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
   // Find the top left corner of the containing window in screen coords, and
   // adjust the output position by this amount.
-  HWND parent_hwnd = manager_->GetParentHWND();
+  HWND parent_hwnd = manager_->GetParentWindow();
   POINT top_left = {0, 0};
   ::ClientToScreen(parent_hwnd, &top_left);
 
@@ -195,9 +195,9 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::accNavigate(
+STDMETHODIMP BrowserAccessibilityWin::accNavigate(
     LONG nav_dir, VARIANT start, VARIANT* end) {
-  BrowserAccessibility* target = GetTargetFromChildID(start);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(start);
   if (!target)
     return E_INVALIDARG;
 
@@ -207,7 +207,7 @@
     return E_INVALIDARG;
   }
 
-  BrowserAccessibility* result = NULL;
+  BrowserAccessibilityWin* result = NULL;
   switch (nav_dir) {
     case NAVDIR_DOWN:
     case NAVDIR_UP:
@@ -241,7 +241,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accChild(VARIANT var_child,
+STDMETHODIMP BrowserAccessibilityWin::get_accChild(VARIANT var_child,
                                                 IDispatch** disp_child) {
   if (!instance_active_)
     return E_FAIL;
@@ -251,7 +251,7 @@
 
   *disp_child = NULL;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_child);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_child);
   if (!target)
     return E_INVALIDARG;
 
@@ -259,7 +259,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accChildCount(LONG* child_count) {
+STDMETHODIMP BrowserAccessibilityWin::get_accChildCount(LONG* child_count) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -270,7 +270,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accDefaultAction(VARIANT var_id,
+STDMETHODIMP BrowserAccessibilityWin::get_accDefaultAction(VARIANT var_id,
                                                         BSTR* def_action) {
   if (!instance_active_)
     return E_FAIL;
@@ -278,7 +278,7 @@
   if (!def_action)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
@@ -286,7 +286,7 @@
       WebAccessibility::ATTR_SHORTCUT, def_action);
 }
 
-STDMETHODIMP BrowserAccessibility::get_accDescription(VARIANT var_id,
+STDMETHODIMP BrowserAccessibilityWin::get_accDescription(VARIANT var_id,
                                                       BSTR* desc) {
   if (!instance_active_)
     return E_FAIL;
@@ -294,21 +294,22 @@
   if (!desc)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
   return target->GetAttributeAsBstr(WebAccessibility::ATTR_DESCRIPTION, desc);
 }
 
-STDMETHODIMP BrowserAccessibility::get_accFocus(VARIANT* focus_child) {
+STDMETHODIMP BrowserAccessibilityWin::get_accFocus(VARIANT* focus_child) {
   if (!instance_active_)
     return E_FAIL;
 
   if (!focus_child)
     return E_INVALIDARG;
 
-  BrowserAccessibility* focus = manager_->GetFocus(this);
+  BrowserAccessibilityWin* focus = static_cast<BrowserAccessibilityWin*>(
+      manager_->GetFocus(this));
   if (focus == this) {
     focus_child->vt = VT_I4;
     focus_child->lVal = CHILDID_SELF;
@@ -322,21 +323,21 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accHelp(VARIANT var_id, BSTR* help) {
+STDMETHODIMP BrowserAccessibilityWin::get_accHelp(VARIANT var_id, BSTR* help) {
   if (!instance_active_)
     return E_FAIL;
 
   if (!help)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
   return target->GetAttributeAsBstr(WebAccessibility::ATTR_HELP, help);
 }
 
-STDMETHODIMP BrowserAccessibility::get_accKeyboardShortcut(VARIANT var_id,
+STDMETHODIMP BrowserAccessibilityWin::get_accKeyboardShortcut(VARIANT var_id,
                                                            BSTR* acc_key) {
   if (!instance_active_)
     return E_FAIL;
@@ -344,21 +345,21 @@
   if (!acc_key)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
   return target->GetAttributeAsBstr(WebAccessibility::ATTR_SHORTCUT, acc_key);
 }
 
-STDMETHODIMP BrowserAccessibility::get_accName(VARIANT var_id, BSTR* name) {
+STDMETHODIMP BrowserAccessibilityWin::get_accName(VARIANT var_id, BSTR* name) {
   if (!instance_active_)
     return E_FAIL;
 
   if (!name)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
@@ -371,7 +372,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accParent(IDispatch** disp_parent) {
+STDMETHODIMP BrowserAccessibilityWin::get_accParent(IDispatch** disp_parent) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -390,14 +391,15 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accRole(VARIANT var_id, VARIANT* role) {
+STDMETHODIMP BrowserAccessibilityWin::get_accRole(
+    VARIANT var_id, VARIANT* role) {
   if (!instance_active_)
     return E_FAIL;
 
   if (!role)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
@@ -411,7 +413,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accState(VARIANT var_id,
+STDMETHODIMP BrowserAccessibilityWin::get_accState(VARIANT var_id,
                                                 VARIANT* state) {
   if (!instance_active_)
     return E_FAIL;
@@ -419,7 +421,7 @@
   if (!state)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
@@ -431,14 +433,15 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accValue(VARIANT var_id, BSTR* value) {
+STDMETHODIMP BrowserAccessibilityWin::get_accValue(
+    VARIANT var_id, BSTR* value) {
   if (!instance_active_)
     return E_FAIL;
 
   if (!value)
     return E_INVALIDARG;
 
-  BrowserAccessibility* target = GetTargetFromChildID(var_id);
+  BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
@@ -448,20 +451,20 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accHelpTopic(BSTR* help_file,
-                                                    VARIANT var_id,
-                                                    LONG* topic_id) {
+STDMETHODIMP BrowserAccessibilityWin::get_accHelpTopic(
+    BSTR* help_file, VARIANT var_id, LONG* topic_id) {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP BrowserAccessibility::get_accSelection(VARIANT* selected) {
+STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) {
   if (!instance_active_)
     return E_FAIL;
 
   return E_NOTIMPL;
 }
 
-STDMETHODIMP BrowserAccessibility::accSelect(LONG flags_sel, VARIANT var_id) {
+STDMETHODIMP BrowserAccessibilityWin::accSelect(
+    LONG flags_sel, VARIANT var_id) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -477,7 +480,7 @@
 // IAccessible2 methods.
 //
 
-STDMETHODIMP BrowserAccessibility::role(LONG* role) {
+STDMETHODIMP BrowserAccessibilityWin::role(LONG* role) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -489,7 +492,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_attributes(BSTR* attributes) {
+STDMETHODIMP BrowserAccessibilityWin::get_attributes(BSTR* attributes) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -515,7 +518,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_states(AccessibleStates* states) {
+STDMETHODIMP BrowserAccessibilityWin::get_states(AccessibleStates* states) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -527,7 +530,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_uniqueID(LONG* unique_id) {
+STDMETHODIMP BrowserAccessibilityWin::get_uniqueID(LONG* unique_id) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -538,18 +541,18 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_windowHandle(HWND* window_handle) {
+STDMETHODIMP BrowserAccessibilityWin::get_windowHandle(HWND* window_handle) {
   if (!instance_active_)
     return E_FAIL;
 
   if (!window_handle)
     return E_INVALIDARG;
 
-  *window_handle = manager_->GetParentHWND();
+  *window_handle = manager_->GetParentWindow();
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_indexInParent(LONG* index_in_parent) {
+STDMETHODIMP BrowserAccessibilityWin::get_indexInParent(LONG* index_in_parent) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -564,7 +567,7 @@
 // IAccessibleImage methods.
 //
 
-STDMETHODIMP BrowserAccessibility::get_description(BSTR* desc) {
+STDMETHODIMP BrowserAccessibilityWin::get_description(BSTR* desc) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -574,7 +577,7 @@
   return GetAttributeAsBstr(WebAccessibility::ATTR_DESCRIPTION, desc);
 }
 
-STDMETHODIMP BrowserAccessibility::get_imagePosition(
+STDMETHODIMP BrowserAccessibilityWin::get_imagePosition(
     enum IA2CoordinateType coordinate_type, long* x, long* y) {
   if (!instance_active_)
     return E_FAIL;
@@ -583,7 +586,7 @@
     return E_INVALIDARG;
 
   if (coordinate_type == IA2_COORDTYPE_SCREEN_RELATIVE) {
-    HWND parent_hwnd = manager_->GetParentHWND();
+    HWND parent_hwnd = manager_->GetParentWindow();
     POINT top_left = {0, 0};
     ::ClientToScreen(parent_hwnd, &top_left);
     *x = location_.x + top_left.x;
@@ -602,7 +605,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_imageSize(long* height, long* width) {
+STDMETHODIMP BrowserAccessibilityWin::get_imageSize(long* height, long* width) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -618,7 +621,7 @@
 // IAccessibleText methods.
 //
 
-STDMETHODIMP BrowserAccessibility::get_nCharacters(long* n_characters) {
+STDMETHODIMP BrowserAccessibilityWin::get_nCharacters(long* n_characters) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -629,7 +632,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_text(
+STDMETHODIMP BrowserAccessibilityWin::get_text(
     long start_offset, long end_offset, BSTR* text) {
   if (!instance_active_)
     return E_FAIL;
@@ -652,7 +655,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_caretOffset(long* offset) {
+STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(long* offset) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -667,7 +670,7 @@
 // ISimpleDOMDocument methods.
 //
 
-STDMETHODIMP BrowserAccessibility::get_URL(BSTR* url) {
+STDMETHODIMP BrowserAccessibilityWin::get_URL(BSTR* url) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -677,7 +680,7 @@
   return GetAttributeAsBstr(WebAccessibility::ATTR_DOC_URL, url);
 }
 
-STDMETHODIMP BrowserAccessibility::get_title(BSTR* title) {
+STDMETHODIMP BrowserAccessibilityWin::get_title(BSTR* title) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -687,7 +690,7 @@
   return GetAttributeAsBstr(WebAccessibility::ATTR_DOC_TITLE, title);
 }
 
-STDMETHODIMP BrowserAccessibility::get_mimeType(BSTR* mime_type) {
+STDMETHODIMP BrowserAccessibilityWin::get_mimeType(BSTR* mime_type) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -697,7 +700,7 @@
   return GetAttributeAsBstr(WebAccessibility::ATTR_DOC_MIMETYPE, mime_type);
 }
 
-STDMETHODIMP BrowserAccessibility::get_docType(BSTR* doc_type) {
+STDMETHODIMP BrowserAccessibilityWin::get_docType(BSTR* doc_type) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -711,7 +714,7 @@
 // ISimpleDOMNode methods.
 //
 
-STDMETHODIMP BrowserAccessibility::get_nodeInfo(
+STDMETHODIMP BrowserAccessibilityWin::get_nodeInfo(
     BSTR* node_name,
     short* name_space_id,
     BSTR* node_value,
@@ -749,7 +752,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_attributes(
+STDMETHODIMP BrowserAccessibilityWin::get_attributes(
     unsigned short max_attribs,
     BSTR* attrib_names,
     short* name_space_id,
@@ -773,7 +776,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_attributesForNames(
+STDMETHODIMP BrowserAccessibilityWin::get_attributesForNames(
     unsigned short num_attribs,
     BSTR* attrib_names,
     short* name_space_id,
@@ -802,7 +805,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_computedStyle(
+STDMETHODIMP BrowserAccessibilityWin::get_computedStyle(
     unsigned short max_style_properties,
     boolean use_alternate_view,
     BSTR *style_properties,
@@ -831,7 +834,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_computedStyleForProperties(
+STDMETHODIMP BrowserAccessibilityWin::get_computedStyleForProperties(
     unsigned short num_style_properties,
     boolean use_alternate_view,
     BSTR* style_properties,
@@ -859,11 +862,11 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::scrollTo(boolean placeTopLeft) {
+STDMETHODIMP BrowserAccessibilityWin::scrollTo(boolean placeTopLeft) {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP BrowserAccessibility::get_parentNode(ISimpleDOMNode** node) {
+STDMETHODIMP BrowserAccessibilityWin::get_parentNode(ISimpleDOMNode** node) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -874,7 +877,7 @@
   return S_OK;
 }
 
-STDMETHODIMP BrowserAccessibility::get_firstChild(ISimpleDOMNode** node)  {
+STDMETHODIMP BrowserAccessibilityWin::get_firstChild(ISimpleDOMNode** node)  {
   if (!instance_active_)
     return E_FAIL;
 
@@ -890,7 +893,7 @@
   }
 }
 
-STDMETHODIMP BrowserAccessibility::get_lastChild(ISimpleDOMNode** node) {
+STDMETHODIMP BrowserAccessibilityWin::get_lastChild(ISimpleDOMNode** node) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -906,7 +909,7 @@
   }
 }
 
-STDMETHODIMP BrowserAccessibility::get_previousSibling(
+STDMETHODIMP BrowserAccessibilityWin::get_previousSibling(
     ISimpleDOMNode** node) {
   if (!instance_active_)
     return E_FAIL;
@@ -923,7 +926,7 @@
   }
 }
 
-STDMETHODIMP BrowserAccessibility::get_nextSibling(ISimpleDOMNode** node) {
+STDMETHODIMP BrowserAccessibilityWin::get_nextSibling(ISimpleDOMNode** node) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -941,7 +944,7 @@
   }
 }
 
-STDMETHODIMP BrowserAccessibility::get_childAt(
+STDMETHODIMP BrowserAccessibilityWin::get_childAt(
     unsigned int child_index,
     ISimpleDOMNode** node) {
   if (!instance_active_)
@@ -963,7 +966,7 @@
 // ISimpleDOMText methods.
 //
 
-STDMETHODIMP BrowserAccessibility::get_domText(BSTR* dom_text) {
+STDMETHODIMP BrowserAccessibilityWin::get_domText(BSTR* dom_text) {
   if (!instance_active_)
     return E_FAIL;
 
@@ -982,7 +985,7 @@
 // IServiceProvider methods.
 //
 
-STDMETHODIMP BrowserAccessibility::QueryService(
+STDMETHODIMP BrowserAccessibilityWin::QueryService(
     REFGUID guidService, REFIID riid, void** object) {
   if (!instance_active_)
     return E_FAIL;
@@ -1005,7 +1008,7 @@
 // CComObjectRootEx methods.
 //
 
-HRESULT WINAPI BrowserAccessibility::InternalQueryInterface(
+HRESULT WINAPI BrowserAccessibilityWin::InternalQueryInterface(
     void* this_ptr,
     const _ATL_INTMAP_ENTRY* entries,
     REFIID iid,
@@ -1035,7 +1038,7 @@
 // Private methods.
 //
 
-BrowserAccessibility* BrowserAccessibility::GetTargetFromChildID(
+BrowserAccessibilityWin* BrowserAccessibilityWin::GetTargetFromChildID(
     const VARIANT& var_id) {
   if (var_id.vt != VT_I4)
     return NULL;
@@ -1050,11 +1053,12 @@
   return manager_->GetFromChildID(child_id);
 }
 
-bool BrowserAccessibility::HasAttribute(WebAccessibility::Attribute attribute) {
+bool BrowserAccessibilityWin::HasAttribute(
+    WebAccessibility::Attribute attribute) {
   return (attributes_.find(attribute) != attributes_.end());
 }
 
-bool BrowserAccessibility::GetAttribute(
+bool BrowserAccessibilityWin::GetAttribute(
     WebAccessibility::Attribute attribute, string16* value) {
   std::map<int32, string16>::iterator iter = attributes_.find(attribute);
   if (iter != attributes_.end()) {
@@ -1065,7 +1069,7 @@
   return false;
 }
 
-HRESULT BrowserAccessibility::GetAttributeAsBstr(
+HRESULT BrowserAccessibilityWin::GetAttributeAsBstr(
     WebAccessibility::Attribute attribute, BSTR* value_bstr) {
   string16 str;
 
@@ -1081,11 +1085,11 @@
   return S_OK;
 }
 
-string16 BrowserAccessibility::Escape(string16 str) {
+string16 BrowserAccessibilityWin::Escape(string16 str) {
   return UTF8ToUTF16(EscapeNonASCII(UTF16ToUTF8(str)));
 }
 
-void BrowserAccessibility::InitRoleAndState(LONG web_role,
+void BrowserAccessibilityWin::InitRoleAndState(LONG web_role,
                                             LONG web_state) {
   state_ = 0;
   ia2_state_ = IA2_STATE_OPAQUE;