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

chrome/browser/views/tab_contents_container_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/tab_contents_container_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 120 matching lines @@
   // with tabs such as the WebContents that instruct the RenderView that it got
   // focus when they actually get the focus. When switching from one WebContents
   // tab that has focus to another WebContents tab that had focus, since the
   // TabContentsContainerView already has focus, Focus() would not be called and
   // the RenderView would not get notified it got focused.
   // By clearing the focused view before-hand, we ensure Focus() will be called.
   GetRootView()->FocusView(NULL);
   View::RequestFocus();
 }
 
-bool TabContentsContainerView::GetAccessibleRole(VARIANT* role) {
+bool TabContentsContainerView::GetAccessibleRole(
+    AccessibilityTypes::Role* role) {
   DCHECK(role);
 
-  role->vt = VT_I4;
-  role->lVal = ROLE_SYSTEM_GROUPING;
+  *role = AccessibilityTypes::ROLE_GROUPING;
   return true;
 }
 
 bool TabContentsContainerView::ShouldLookupAccelerators(
     const views::KeyEvent& e) {
   // Don't look-up accelerators if we are showing a non-crashed WebContents.
   // We'll first give the page a chance to process the key events.  If it does
   // not process them, they'll be returned to us and we'll treat them as
   // accelerators then.
   if (tab_contents_ && !tab_contents_->is_crashed() &&
@@ skipping 65 matching lines @@
   if (focus_manager->GetFocusedView() == this)
     Focus();
 }
 
 void TabContentsContainerView::TabContentsDestroyed(TabContents* contents) {
   // Sometimes, a TabContents is destroyed before we know about it. This allows
   // us to clean up our state in case this happens.
   DCHECK(contents == tab_contents_);
   SetTabContents(NULL);
 }