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

chrome/browser/views/toolbar_view.h

Index: chrome/browser/views/toolbar_view.h
===================================================================
--- chrome/browser/views/toolbar_view.h	(revision 14426)
+++ chrome/browser/views/toolbar_view.h	(working copy)
@@ -60,6 +60,9 @@
   virtual bool OnKeyPressed(const views::KeyEvent& e);
   virtual bool OnKeyReleased(const views::KeyEvent& e);
   virtual gfx::Size GetPreferredSize();
+  virtual bool GetAccessibleName(std::wstring* name);
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual void SetAccessibleName(const std::wstring& name);
 
   // Overridden from EncodingMenuControllerDelegate:
   virtual bool IsItemChecked(int id) const;
@@ -91,17 +94,6 @@
 
   virtual void OnInputInProgress(bool in_progress);
 
-  // Returns a brief, identifying string, containing a unique, readable name.
-  virtual bool GetAccessibleName(std::wstring* name);
-
-  // 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.
-  virtual bool GetAccessibleRole(VARIANT* role);
-
-  // Assigns an accessible string name.
-  virtual void SetAccessibleName(const std::wstring& name);
-
   virtual View* GetAccFocusedChildView() { return acc_focused_view_; }
 
   // Returns the index of the next view of the toolbar, starting from the given