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

chrome/browser/views/frame/opaque_browser_frame_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/frame/opaque_browser_frame_view.h"
 
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/gfx/chrome_canvas.h"
@@ skipping 575 matching lines @@
                                                   views::View* parent,
                                                   views::View* child) {
   if (is_add && child == this) {
     // The Accessibility glue looks for the product name on these two views to
     // determine if this is in fact a Chrome window.
     GetRootView()->SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
     SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
   }
 }
 
-bool OpaqueBrowserFrameView::GetAccessibleRole(VARIANT* role) {
+bool OpaqueBrowserFrameView::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
   // We aren't actually the client area of the window, but we act like it as
-  // far as MSAA and the UI tests are concerned.
-  role->vt = VT_I4;
-  role->lVal = ROLE_SYSTEM_CLIENT;
+  // far as accessibility and the UI tests are concerned.
+  *role = AccessibilityTypes::ROLE_CLIENT;
   return true;
 }
 
 bool OpaqueBrowserFrameView::GetAccessibleName(std::wstring* name) {
   if (!accessible_name_.empty()) {
     *name = accessible_name_;
     return true;
   }
   return false;
 }
@@ skipping 446 matching lines @@
 }
 
 // static
 void OpaqueBrowserFrameView::InitAppWindowResources() {
   static bool initialized = false;
   if (!initialized) {
     title_font_ = new ChromeFont(win_util::GetWindowTitleFont());
     initialized = true;
   }
 }