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

chrome/views/controls/button/menu_button.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_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 #define CHROME_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 
 #include <windows.h>
 
 #include "chrome/common/gfx/chrome_font.h"
@@ skipping 35 matching lines @@
   virtual gfx::Size GetPreferredSize();
   virtual void Paint(ChromeCanvas* canvas, bool for_drag);
 
   // These methods are overriden to implement a simple push button
   // behavior
   virtual bool OnMousePressed(const MouseEvent& e);
   void OnMouseReleased(const MouseEvent& e, bool canceled);
   virtual bool OnKeyReleased(const KeyEvent& e);
   virtual void OnMouseExited(const MouseEvent& event);
 
-  // Returns the MSAA default action of the current view. The string returned
-  // describes the default action that will occur when executing
-  // IAccessible::DoDefaultAction.
-  bool GetAccessibleDefaultAction(std::wstring* action);
-
-  // 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 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);
+  // Accessibility accessors, overridden from View.
+  virtual bool GetAccessibleDefaultAction(std::wstring* action);
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual bool GetAccessibleState(AccessibilityTypes::State* state);
 
  protected:
   // true if the menu is currently visible.
   bool menu_visible_;
 
  private:
 
   // Compute the maximum X coordinate for the current screen. MenuButtons
   // use this to make sure a menu is never shown off screen.
   int GetMaximumScreenXCoordinate();
@@ skipping 13 matching lines @@
 
   // Whether or not we're showing a drop marker.
   bool show_menu_marker_;
 
   friend class TextButtonBackground;
 };
 
 }  // namespace views
 
 #endif  // CHROME_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_