2 files changed, 10 insertions, 5 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index 1bf8421..0ee90ed 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -565,6 +565,12 @@ void RenderWidgetHostViewWin::Show() {
   SetParent(parent_hwnd_);
   ShowWindow(SW_SHOW);
 
+  // Save away our HWND in the parent window as a property so that the
+  // accessibility code can find it.
+  accessibility_prop_.reset(new ViewProp(GetParent(),
+                                         kViewsNativeHostPropForAccessibility,
+                                         m_hWnd));
+
   DidBecomeSelected();
 }
 
@@ -575,6 +581,8 @@ void RenderWidgetHostViewWin::Hide() {
     return;
   }
 
+  accessibility_prop_.reset();
+
   if (::GetFocus() == m_hWnd)
     ::SetFocus(NULL);
   ShowWindow(SW_HIDE);
@@ -832,11 +840,6 @@ LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
   // Marks that window as supporting mouse-wheel messages rerouting so it is
   // scrolled when under the mouse pointer even if inactive.
   props_.push_back(views::SetWindowSupportsRerouteMouseWheel(m_hWnd));
-  // Save away our HWND in the parent window as a property so that the
-  // accessibility code can find it.
-  props_.push_back(new ViewProp(GetParent(),
-                                kViewsNativeHostPropForAccessibility,
-                                m_hWnd));
   props_.push_back(new ViewProp(m_hWnd, kRenderWidgetHostViewKey,
                                 static_cast<RenderWidgetHostView*>(this)));
   return 0;
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h
index 015457e..330af98 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.h
@@ -352,6 +352,8 @@ class RenderWidgetHostViewWin
 
   ScopedVector<ui::ViewProp> props_;
 
+  scoped_ptr<ui::ViewProp> accessibility_prop_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
 };