Improve omnibox accessibility on Windows.

views/widget/native_widget_win.h

 // Copyright (c) 2011 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.
 
 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
 #define VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ skipping 84 matching lines @@
   static gfx::Font GetWindowTitleFont();
 
   // Show the window with the specified show command.
   void Show(int show_state);
 
   // Disable Layered Window updates by setting to false.
   void set_can_update_layered_window(bool can_update_layered_window) {
     can_update_layered_window_ = can_update_layered_window;
   }
 
-  // Obtain the view event with the given MSAA child id.  Used in
+  // Obtain the view corresponding to a MSAA child id. Used in
   // NativeViewAccessibilityWin::get_accChild to support requests for
   // children of windowless controls.  May return NULL
   // (see ViewHierarchyChanged).
-  View* GetAccessibilityViewEventAt(int id);
-
-  // Add a view that has recently fired an accessibility event.  Returns a MSAA
-  // child id which is generated by: -(index of view in vector + 1) which
-  // guarantees a negative child id.  This distinguishes the view from
-  // positive MSAA child id's which are direct leaf children of views that have
-  // associated hWnd's (e.g. NativeWidgetWin).
-  int AddAccessibilityViewEvent(View* view);
-
-  // Clear a view that has recently been removed on a hierarchy change.
-  void ClearAccessibilityViewEvent(View* view);
+  View* GetViewByAccessibleId(long id);
 
   // Hides the window if it hasn't already been force-hidden. The force hidden
   // count is tracked, so calling multiple times is allowed, you just have to
   // be sure to call PopForceHidden the same number of times.
   void PushForceHidden();
 
   // Decrements the force hidden count, showing the window if we have reached
   // the top of the stack. See PushForceHidden.
   void PopForceHidden();
 
@@ skipping 397 matching lines @@
   // Stops ignoring SetWindowPos() requests (see below).
   void StopIgnoringPosChanges() { ignore_window_pos_changes_ = false; }
 
   void RestoreEnabledIfNecessary();
 
   void SetInitialFocus();
 
   // Overridden from internal::InputMethodDelegate
   virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
 
+  // Recursively search through all descendant views to find one with
+  // this IAccessible2 unique id and return the View if found, or
+  // NULL if not.
+  View* FindViewByIA2UniqueId(long id, View* view);
+
   // A delegate implementation that handles events received here.
   // See class documentation for Widget in widget.h for a note about ownership.
   internal::NativeWidgetDelegate* delegate_;
 
   // The following factory is used for calls to close the NativeWidgetWin
   // instance.
   base::WeakPtrFactory<NativeWidgetWin> close_widget_factory_;
 
   // The flags currently being used with TrackMouseEvent to track mouse
   // messages. 0 if there is no active tracking. The value of this member is
@@ skipping 41 matching lines @@
   // Whether the focus should be restored next time we get enabled.  Needed to
   // restore focus correctly when Windows modal dialogs are displayed.
   bool restore_focus_when_enabled_;
 
   // Instance of accessibility information and handling for MSAA root
   base::win::ScopedComPtr<IAccessible> accessibility_root_;
 
   // Value determines whether the Widget is customized for accessibility.
   static bool screen_reader_active_;
 
-  // The maximum number of view events in our vector below.
-  static const int kMaxAccessibilityViewEvents = 20;
-
-  // A vector used to access views for which we have sent notifications to
-  // accessibility clients.  It is used as a circular queue.
-  std::vector<View*> accessibility_view_events_;
-
-  // The current position of the view events vector.  When incrementing,
-  // we always mod this value with the max view events above .
-  int accessibility_view_events_index_;
-
   // The last cursor that was active before the current one was selected. Saved
   // so that we can restore it.
   gfx::NativeCursor previous_cursor_;
 
   ViewProps props_;
 
   // True if we're in fullscreen mode.
   bool fullscreen_;
 
   // If this is greater than zero, we should prevent attempts to make the window
@@ skipping 47 matching lines @@
   // rather than asking the Widget for the non_client_view so that we know at
   // Init time, before the Widget has created the NonClientView.
   bool has_non_client_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_