Keep a map of all views that have sent notifications. This ensures that Acce...

views/widget/widget_win.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "views/widget/widget_win.h"
 
 #include "app/l10n_util_win.h"
 #include "app/system_monitor.h"
 #include "app/win_util.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
@@ skipping 38 matching lines @@
       active_mouse_tracking_flags_(0),
       has_capture_(false),
       use_layered_buffer_(true),
       layered_alpha_(255),
       delete_on_destroy_(true),
       can_update_layered_window_(true),
       last_mouse_event_was_move_(false),
       is_mouse_down_(false),
       is_window_(false),
       restore_focus_when_enabled_(false),
-      delegate_(NULL) {
+      delegate_(NULL),
+      accessibility_view_events_index_(-1),
+      accessibility_view_events_(kMaxAccessibilityViewEvents) {
 }
 
 WidgetWin::~WidgetWin() {
 }
 
 // static
 WidgetWin* WidgetWin::GetWidget(HWND hwnd) {
   // TODO(jcivelli): http://crbug.com/44499 We need a way to test that hwnd is
   //                 associated with a WidgetWin (it might be a pure
   //                 WindowImpl).
@@ skipping 34 matching lines @@
   use_layered_buffer_ = use_layered_buffer;
   if (!hwnd())
     return;
 
   if (use_layered_buffer_)
     LayoutRootView();
   else
     contents_.reset(NULL);
 }
 
+View* WidgetWin::GetAccessibilityViewEventAt(int id) {
+  // Convert from MSAA child id.
+  id = -(id + 1);
+  DCHECK(id >= 0 && id < kMaxAccessibilityViewEvents);
+  return accessibility_view_events_[id];
+}
+
+int WidgetWin::AddAccessibilityViewEvent(View* view) {
+  accessibility_view_events_index_ =
+      (accessibility_view_events_index_ + 1) % kMaxAccessibilityViewEvents;
+  accessibility_view_events_[accessibility_view_events_index_] = view;
+
+  // Convert to MSAA child id.
+  return -(accessibility_view_events_index_ + 1);
+}
+
+void WidgetWin::ClearAccessibilityViewEvent(View* view) {
+  for (std::vector<View*>::iterator it = accessibility_view_events_.begin();
+      it != accessibility_view_events_.end();
+      ++it) {
+    if (*it == view)
+      *it = NULL;
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Widget implementation:
 
 void WidgetWin::Init(gfx::NativeView parent, const gfx::Rect& bounds) {
   // Force creation of the RootView; otherwise, we may get a WM_SIZE after the
   // window is created and before the root view is set up.
   GetRootView();
 
   // Create the window.
   WindowImpl::Init(parent, bounds);
@@ skipping 296 matching lines @@
     // dealing with cases where the widget has been unparented.
     return widget->GetFocusManager();
   }
   return NULL;
 }
 
 void WidgetWin::ViewHierarchyChanged(bool is_add, View *parent,
                                      View *child) {
   if (drop_target_.get())
     drop_target_->ResetTargetViewIfEquals(child);
+
+  if (!is_add)
+    ClearAccessibilityViewEvent(child);
 }
 
 
 bool WidgetWin::ContainsNativeView(gfx::NativeView native_view) {
   if (hwnd() == native_view)
     return true;
 
   // Traverse the set of parents of the given view to determine if native_view
   // is a descendant of this window.
   HWND parent_window = ::GetParent(native_view);
@@ skipping 895 matching lines @@
 Widget* Widget::GetWidgetFromNativeWindow(gfx::NativeWindow native_window) {
   return Widget::GetWidgetFromNativeView(native_window);
 }
 
 // static
 void Widget::NotifyLocaleChanged() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace views