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

chrome/views/controls/label.cc

 // 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.
 
 #include "chrome/views/controls/label.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 393 matching lines @@
   gfx::Insets insets = GetInsets();
   label_width += insets.width();
 
   if (max_width > 0)
     label_width = std::min(label_width, max_width);
 
   SetBounds(x(), y(), label_width, 0);
   SizeToPreferredSize();
 }
 
-#if defined(OS_WIN)
-bool Label::GetAccessibleRole(VARIANT* role) {
+bool Label::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
 
-  role->vt = VT_I4;
-  role->lVal = ROLE_SYSTEM_TEXT;
+  *role = AccessibilityTypes::ROLE_TEXT;
   return true;
 }
 
 bool Label::GetAccessibleName(std::wstring* name) {
   *name = GetText();
   return true;
 }
 
-bool Label::GetAccessibleState(VARIANT* state) {
+bool Label::GetAccessibleState(AccessibilityTypes::State* state) {
   DCHECK(state);
 
-  state->lVal |= STATE_SYSTEM_READONLY;
+  *state = AccessibilityTypes::STATE_READONLY;
   return true;
 }
-#endif  // defined(OS_WIN)
 
 }  // namespace views