Removes the use of Windows-specific types for accessibility roles and states ...

chrome/views/widget/root_view.h

 // Copyright (c) 2009 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_VIEWS_WIDGET_ROOT_VIEW_H_
 #define CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
 
 #include "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
@@ skipping 170 matching lines @@
   // to invoke this. This is primarily intended for Widgets.
   void ClearPaintRect();
 
 #if defined(OS_WIN)
   // Invoked from the Widget to service a WM_PAINT call.
   void OnPaint(HWND hwnd);
 #elif defined(TOOLKIT_GTK)
   void OnPaint(GdkEventExpose* event);
 #endif
 
-#if defined(OS_WIN)
-  // Returns the MSAA role of the current view. The role is what assistive
-  // technologies (ATs) use to determine what behavior to expect from a given
-  // control.
-  bool GetAccessibleRole(VARIANT* role);
-#endif
-
-  // Returns a brief, identifying string, containing a unique, readable name.
-  bool GetAccessibleName(std::wstring* name);
-
-  // Assigns an accessible string name.
-  void SetAccessibleName(const std::wstring& name);
+  // Accessibility accessors/mutators, overridden from View.
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual bool GetAccessibleName(std::wstring* name);
+  virtual void SetAccessibleName(const std::wstring& name);
 
  protected:
 
   // Overridden to properly reset our event propagation member
   // variables when a child is removed
   virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
 
 #ifndef NDEBUG
   virtual bool IsProcessingPaint() const { return is_processing_paint_; }
 #endif
@@ skipping 149 matching lines @@
 
 #ifndef NDEBUG
   // True if we're currently processing paint.
   bool is_processing_paint_;
 #endif
 };
 
 }  // namespace views
 
 #endif // CHROME_VIEWS_WIDGET_ROOT_VIEW_H_