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

chrome/views/controls/label.h

Index: chrome/views/controls/label.h
===================================================================
--- chrome/views/controls/label.h	(revision 14426)
+++ chrome/views/controls/label.h	(working copy)
@@ -164,23 +164,11 @@
   // wrapped).  If 0, no maximum width is enforced.
   void SizeToFit(int max_width);
 
-#if defined(OS_WIN)
-  // TODO(port): Make portable equivalents of accessibility-related functions.
+  // Accessibility accessors, overridden from View.
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual bool GetAccessibleName(std::wstring* name);
+  virtual bool GetAccessibleState(AccessibilityTypes::State* state);
 
-  // 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);
-
-  // Returns a brief, identifying string, containing a unique, readable name.
-  bool GetAccessibleName(std::wstring* name);
-
-  // Returns the MSAA state of the current view. Sets the input VARIANT
-  // appropriately, and returns true if a change was performed successfully.
-  // Overriden from View.
-  virtual bool GetAccessibleState(VARIANT* state);
-#endif  // defined(OS_WIN)
-
   // Gets/sets the flag to determine whether the label should be collapsed when
   // it's hidden (not visible). If this flag is true, the label will return a
   // preferred size of (0, 0) when it's not visible.