Remove use of accessible prop service from render_widget_host_view_win.cc...

chrome/browser/renderer_host/render_widget_host_view_win.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/renderer_host/render_widget_host_view_win.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
@@ skipping 1548 matching lines @@
 LRESULT RenderWidgetHostViewWin::OnGetObject(UINT message, WPARAM wparam,
                                              LPARAM lparam, BOOL& handled) {
   if (lparam != OBJID_CLIENT) {
     handled = false;
     return static_cast<LRESULT>(0L);
   }
 
   if (!browser_accessibility_manager_.get()) {
     render_widget_host_->EnableRendererAccessibility();
 
-    if (!loading_accessible_.get()) {
-      // Create IAccessible to return while waiting for the accessibility tree
-      // from the renderer.
-      HRESULT hr = ::CreateStdAccessibleObject(
-          m_hWnd, OBJID_CLIENT, IID_IAccessible,
-          reinterpret_cast<void **>(&loading_accessible_));
+    // Return busy document tree while renderer accessibility tree loads.
+    webkit_glue::WebAccessibility loading_tree;
+    loading_tree.role = WebAccessibility::ROLE_DOCUMENT;
+    loading_tree.state = (1 << WebAccessibility::STATE_BUSY);
+    browser_accessibility_manager_.reset(
+      new BrowserAccessibilityManager(m_hWnd, loading_tree, this));
+  }
 
-      // Annotate with STATE_SYSTEM_BUSY to indicate that the page is loading.
-      // We annotate the HWND, not the loading_accessible IAccessible, but the
-      // IAccessible will reflect the state annotation.
-      ScopedComPtr<IAccPropServices> pAccPropServices;
-      hr = CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER,
-          IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
-      if (SUCCEEDED(hr)) {
-        VARIANT var;
-        var.vt = VT_I4;
-        var.lVal = STATE_SYSTEM_BUSY;
-        pAccPropServices->SetHwndProp(
-            m_hWnd, OBJID_CLIENT, CHILDID_SELF, PROPID_ACC_STATE, var);
-
-        // Annotate with ROLE_SYSTEM_DOCUMENT, indicates page is a document.
-        var.lVal = ROLE_SYSTEM_DOCUMENT;
-        pAccPropServices->SetHwndProp(
-            m_hWnd, OBJID_CLIENT, CHILDID_SELF, PROPID_ACC_ROLE, var);
-      }
-    }
-
-    if (loading_accessible_.get()) {
-      return LresultFromObject(
-          IID_IAccessible, wparam,
-          static_cast<IAccessible*>(loading_accessible_));
-    }
-  } else {
-    BrowserAccessibility* root = browser_accessibility_manager_->GetRoot();
-    if (root) {
-      return LresultFromObject(IID_IAccessible, wparam,
-          static_cast<IAccessible*>(root->NewReference()));
-    }
+  BrowserAccessibility* root = browser_accessibility_manager_->GetRoot();
+  if (root) {
+    return LresultFromObject(IID_IAccessible, wparam,
+        static_cast<IAccessible*>(root->NewReference()));
   }
 
   handled = false;
   return static_cast<LRESULT>(0L);
 }
 
 void RenderWidgetHostViewWin::OnFinalMessage(HWND window) {
   // When the render widget host is being destroyed, it ends up calling
   // WillDestroyRenderWidget (through the RENDER_WIDGET_HOST_DESTROYED
   // notification) which NULLs render_widget_host_.
@@ skipping 113 matching lines @@
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView native_view) {
   if (::IsWindow(native_view)) {
     HANDLE raw_render_host_view = ::GetProp(native_view,
                                             kRenderWidgetHostViewKey);
     if (raw_render_host_view)
       return reinterpret_cast<RenderWidgetHostView*>(raw_render_host_view);
   }
   return NULL;
 }