Windows accessibility improvements: 1. All WebKit roles are now passed to the...

chrome/browser/browser_accessibility_manager.cc

 // Copyright (c) 2010 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/browser_accessibility_manager.h"
 
 #include "base/scoped_comptr_win.h"
 #include "chrome/browser/browser_accessibility.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 12 matching lines @@
 // static
 // Start child IDs at -1 and decrement each time, because clients use
 // child IDs of 1, 2, 3, ... to access the children of an object by
 // index, so we use negative IDs to clearly distinguish between indices
 // and unique IDs.
 LONG BrowserAccessibilityManager::next_child_id_ = -1;
 
 BrowserAccessibilityManager::BrowserAccessibilityManager(
     HWND parent_hwnd,
     const webkit_glue::WebAccessibility& src,
+    BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory)
     : parent_hwnd_(parent_hwnd),
-      factory_(factory) {
+      delegate_(delegate),
+      factory_(factory),
+      focus_(NULL) {
   HRESULT hr = ::CreateStdAccessibleObject(
       parent_hwnd_, OBJID_WINDOW, IID_IAccessible,
       reinterpret_cast<void **>(&window_iaccessible_));
   DCHECK(SUCCEEDED(hr));
   root_ = CreateAccessibilityTree(NULL, src, 0);
   if (!focus_)
     focus_ = root_;
 }
 
 BrowserAccessibilityManager::~BrowserAccessibilityManager() {
@@ skipping 29 matching lines @@
 }
 
 BrowserAccessibility* BrowserAccessibilityManager::GetFocus(
     BrowserAccessibility* root) {
   if (focus_ && (!root || focus_->IsDescendantOf(root)))
     return focus_;
 
   return NULL;
 }
 
+void BrowserAccessibilityManager::SetFocus(const BrowserAccessibility& node) {
+  if (delegate_)
+    delegate_->SetAccessibilityFocus(node.renderer_id());
+}
+
+void BrowserAccessibilityManager::DoDefaultAction(
+    const BrowserAccessibility& node) {
+  if (delegate_)
+    delegate_->AccessibilityDoDefaultAction(node.renderer_id());
+}
+
 void BrowserAccessibilityManager::OnAccessibilityFocusChange(int renderer_id) {
   base::hash_map<int, LONG>::iterator iter =
       renderer_id_to_child_id_map_.find(renderer_id);
   if (iter == renderer_id_to_child_id_map_.end())
     return;
 
   LONG child_id = iter->second;
   base::hash_map<LONG, BrowserAccessibility*>::iterator uniq_iter =
     child_id_map_.find(child_id);
   if (uniq_iter != child_id_map_.end())
@@ skipping 33 matching lines @@
   if ((src.state >> WebAccessibility::STATE_FOCUSED) & 1)
     focus_ = instance;
   for (int i = 0; i < static_cast<int>(src.children.size()); ++i) {
     BrowserAccessibility* child = CreateAccessibilityTree(
         instance, src.children[i], i);
     instance->AddChild(child);
   }
 
   return instance;
 }