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

chrome/browser/views/toolbar_view.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/browser/views/toolbar_view.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 719 matching lines @@
 }
 
 bool BrowserToolbarView::GetAccessibleName(std::wstring* name) {
   if (!accessible_name_.empty()) {
     (*name).assign(accessible_name_);
     return true;
   }
   return false;
 }
 
-bool BrowserToolbarView::GetAccessibleRole(VARIANT* role) {
+bool BrowserToolbarView::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
 
-  role->vt = VT_I4;
-  role->lVal = ROLE_SYSTEM_TOOLBAR;
+  *role = AccessibilityTypes::ROLE_TOOLBAR;
   return true;
 }
 
 void BrowserToolbarView::SetAccessibleName(const std::wstring& name) {
   accessible_name_.assign(name);
 }
 
 int BrowserToolbarView::GetNextAccessibleViewIndex(int view_index,
                                                    bool nav_left) {
   int modifier = 1;
@@ skipping 146 matching lines @@
     case IDC_COPY:
       *accel = views::Accelerator(L'C', false, true, false);
       return true;
     case IDC_PASTE:
       *accel = views::Accelerator(L'V', false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
   return GetWidget()->GetAccelerator(id, accel);
 }