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

chrome/views/view.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_VIEW_H_
 #define CHROME_VIEWS_VIEW_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #endif  // defined(OS_WIN)
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "chrome/common/accessibility_types.h"
 #include "chrome/views/accelerator.h"
 #include "chrome/views/background.h"
 #include "chrome/views/border.h"
 
 namespace gfx {
 class Insets;
 class Path;
 }
 
 class ChromeCanvas;
@@ skipping 519 matching lines @@
   // successful.
   virtual bool GetAccessibleKeyboardShortcut(std::wstring* shortcut) {
     return false;
   }
 
   // Returns a brief, identifying string, containing a unique, readable name of
   // a given control. Sets the input string appropriately, and returns true if
   // successful.
   virtual bool GetAccessibleName(std::wstring* name) { return false; }
 
-#if defined(OS_WIN)
-  // TODO(port): Make these functions using VARIANT portable.
+  // Returns the accessibility role of the current view. The role is what
+  // assistive technologies (ATs) use to determine what behavior to expect from
+  // a given control. Sets the input Role appropriately, and returns true if
+  // successful.
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role) {
+    return false;
+  }
 
-  // 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. Sets the input VARIANT appropriately, and returns true if
-  // successful.
-  virtual bool GetAccessibleRole(VARIANT* role) { return false; }
-
-  // Returns the MSAA state of the current view. Sets the input VARIANT
-  // appropriately, and returns true if a change was performed successfully.
-  virtual bool GetAccessibleState(VARIANT* state) { return false; }
-#endif  // defined(OS_WIN)
+  // Returns the accessibility state of the current view. Sets the input State
+  // appropriately, and returns true if successful.
+  virtual bool GetAccessibleState(AccessibilityTypes::State* state) {
+    return false;
+  }
 
   // Assigns a keyboard shortcut string description to the given control. Needed
   // as a View does not know which shortcut will be associated with it until it
   // is created to be a certain type.
   virtual void SetAccessibleKeyboardShortcut(const std::wstring& shortcut) {}
 
   // Assigns a string name to the given control. Needed as a View does not know
   // which name will be associated with it until it is created to be a
   // certain type.
   virtual void SetAccessibleName(const std::wstring& name) {}
@@ skipping 752 matching lines @@
   // is going to be flipped horizontally (using the appropriate transform) on
   // right-to-left locales for this View.
   bool flip_canvas_on_paint_for_rtl_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // CHROME_VIEWS_VIEW_H_