| Index: views/widget/native_widget_win.h
|
| ===================================================================
|
| --- views/widget/native_widget_win.h (revision 107097)
|
| +++ views/widget/native_widget_win.h (working copy)
|
| @@ -102,22 +102,12 @@
|
| 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);
|
| + View* GetViewByAccessibleId(long 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);
|
| -
|
| // 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.
|
| @@ -534,6 +524,11 @@
|
| // 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_;
|
| @@ -595,17 +590,6 @@
|
| // 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_;
|
|
|