Accessibility information from the renderer was not being returned to tools l...

chrome/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2009 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/gfx/canvas.h"
 #include "app/gfx/gdi_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "grit/webkit_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/win/WebInputEventFactory.h"
+#include "views/accessibility/view_accessibility.h"
 #include "views/focus/focus_util_win.h"
 // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
 #include "views/widget/widget_win.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 using WebKit::WebInputEvent;
@@ skipping 630 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewWin, private:
 
 LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
   // Call the WM_INPUTLANGCHANGE message handler to initialize the input locale
   // of a browser process.
   OnInputLangChange(0, 0);
   // Marks that window as supporting mouse-wheel messages rerouting so it is
   // scrolled when under the mouse pointer even if inactive.
   views::SetWindowSupportsRerouteMouseWheel(m_hWnd);
+  // Save away our HWND in the parent window as a property so that the
+  // accessibility code can find it.
+  SetProp(GetParent(), kViewsNativeHostPropForAccessibility, m_hWnd);
   return 0;
 }
 
 void RenderWidgetHostViewWin::OnActivate(UINT action, BOOL minimized,
                                          HWND window) {
   // If the container is a popup, clicking elsewhere on screen should close the
   // popup.
   if (close_on_deactivate_ && action == WA_INACTIVE) {
     // Send a windows message so that any derived classes
     // will get a change to override the default handling
@@ skipping 548 matching lines @@
       // conflicts with the ids used by MSAA.
       BrowserAccessibilityManager::GetInstance()->CreateAccessibilityInstance(
           IID_IAccessible, 1000,
           render_widget_host_->routing_id(),
           render_widget_host_->process()->id(),
           m_hWnd,
           reinterpret_cast<void **>(browser_accessibility_root_.Receive()));
 
       if (!browser_accessibility_root_) {
         // No valid root found, return with failure.
-        NOTREACHED();
         return static_cast<LRESULT>(0L);
       }
     }
 
     // Create a reference to BrowserAccessibility which MSAA will marshall to
     // the client.
     reference_result = LresultFromObject(IID_IAccessible, wparam,
         static_cast<IAccessible*>(browser_accessibility_root_));
   }
   return reference_result;
@@ skipping 83 matching lines @@
     // WM_LBUTTONDOWN.
     SetFocus();
   }
 }
 
 void RenderWidgetHostViewWin::ShutdownHost() {
   shutdown_factory_.RevokeAll();
   render_widget_host_->Shutdown();
   // Do not touch any members at this point, |this| has been deleted.
 }